From f0d44c18d71e7450b99189c1221a2f89c7817ab6 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 6 Dec 2012 16:49:12 -0800 Subject: Mach64PixelARGB should use exaGetPixmapFirstPixel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes crash attempting to read a pixel from a NULL pPixmap->devPrivate.ptr Signed-off-by: Alan Coopersmith Reviewed-by: Michel Dänzer --- src/atimach64render.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) (limited to 'src') diff --git a/src/atimach64render.c b/src/atimach64render.c index 4862cd4..ffde2cb 100644 --- a/src/atimach64render.c +++ b/src/atimach64render.c @@ -209,22 +209,7 @@ Mach64PixelARGB(PixmapPtr pPixmap, CARD32 format, CARD32 *argb) CARD8 comp; int bits, shift; - /* Ensure that texture drawing has completed. */ - exaWaitSync(pPixmap->drawable.pScreen); - - /* exaGetPixmapFirstPixel() */ - - switch (pPixmap->drawable.bitsPerPixel) { - case 32: - pixel = *(CARD32 *)(pPixmap->devPrivate.ptr); - break; - case 16: - pixel = *(CARD16 *)(pPixmap->devPrivate.ptr); - break; - default: - pixel = *(CARD8 *)(pPixmap->devPrivate.ptr); - break; - } + pixel = exaGetPixmapFirstPixel(pPixmap); /* exaGetRGBAFromPixel()/viaPixelARGB8888() */ -- cgit v1.2.3