← Back to branch summary

~ubuntu-branches/ubuntu/karmic/xserver-xorg-video-intel/karmic-proposed

« back to all changes in this revision

Viewing changes to uxa/uxa-accel.c

  • Committer: Bazaar Package Importer
  • Author(s): Brice Goglin
  • Date: 2009-09-23 01:03:49 UTC
  • mfrom: (1.3.4 upstream) (1.2.9 sid)
  • mto: (1.5.3 squeeze)
  • mto: This revision was merged to the branch mainline in revision 102.
  • Revision ID: james.westby@ubuntu.com-20090923010349-dyyejg48nm80lh8u
Tags: 2:2.8.99.902-1
http://bugs.debian.org/543326
* New upstream release candidate.
  + Fix crash on server regen, closes: #543326.

Show diffs side-by-side

added added

removed removed

Lines of Context:
uxa/uxa-accel.c
1
1
/*
2
 
 * Copyright � 2001 Keith Packard
 
2
 * Copyright ® 2001 Keith Packard
3
3
 *
4
 
 * Partly based on code that is Copyright � The XFree86 Project Inc.
 
4
 * Partly based on code that is Copyright ® The XFree86 Project Inc.
5
5
 *
6
6
 * Permission to use, copy, modify, distribute, and sell this software and its
7
7
 * documentation for any purpose is hereby granted without fee, provided that
23
23
 *
24
24
 * Authors:
25
25
 *    Eric Anholt <eric@anholt.net>
26
 
 *    Michel D�nzer <michel@tungstengraphics.com>
 
26
 *    Michel Dänzer <michel@tungstengraphics.com>
27
27
 *
28
28
 */
29
29
 
216
216
 
217
217
#ifdef MITSHM
218
218
 
 
219
#include "xorgVersion.h"
 
220
 
219
221
static Bool
220
222
uxa_do_shm_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth,
221
223
                 unsigned int format, int w, int h, int sx, int sy, int sw,
251
253
    return FALSE;
252
254
}
253
255
 
 
256
#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,5,99,0,0)
 
257
 
254
258
/* The actual ShmPutImage isn't wrapped by the damage layer, so we need to
255
259
 * inform any interested parties of the damage incurred to the drawable.
256
260
 *
271
275
        uxa_finish_access(pDrawable);
272
276
    }
273
277
}
 
278
#else
 
279
#define uxa_shm_put_image NULL
 
280
#endif
274
281
 
275
282
ShmFuncs uxa_shm_funcs = { NULL, uxa_shm_put_image };
276
283