frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EXA: Fix exaGetPixmapFirstPixel() crash if the driver has a CreatePixmap hook. 

Fixes http://bugs.freedesktop.org/show_bug.cgi?id=16243
This commit is contained in:
Michel Dänzer 2008-06-06 11:01:03 +02:00
parent d25ffcfbfc
commit 6b96281100
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
exa/exa_unaccel.c
View File

@ -362,6 +362,7 @@ ExaCheckComposite (CARD8 op,
CARD32 CARD32
exaGetPixmapFirstPixel (PixmapPtr pPixmap) exaGetPixmapFirstPixel (PixmapPtr pPixmap)
{ {
ExaScreenPriv(pPixmap->drawable.pScreen);
CARD32 pixel; CARD32 pixel;
void *fb; void *fb;
Bool need_finish = FALSE; Bool need_finish = FALSE;
@ -376,7 +377,8 @@ exaGetPixmapFirstPixel (PixmapPtr pPixmap)
fb = pExaPixmap->sys_ptr; fb = pExaPixmap->sys_ptr;
/* Try to avoid framebuffer readbacks */ /* Try to avoid framebuffer readbacks */
if ((!offscreen && !sys_valid && !damaged) || if (pExaScr->info->CreatePixmap ||
(!offscreen && !sys_valid && !damaged) ||
(offscreen && (!sys_valid || damaged))) (offscreen && (!sys_valid || damaged)))
{ {
box.x1 = 0; box.x1 = 0;