Module Name: xsrc
Committed By: macallan
Date: Tue Nov 12 23:09:32 UTC 2013
Modified Files:
xsrc/external/mit/xf86-video-mach64/dist/src: atimach64render.c
Log Message:
"Deal with pPict->pDrawable == NULL for source-only pictures.
Falling back to software rendering for such source pictures (solid/gradient)."
from Matthieu Herrb via x.org
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c
diff -u xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c:1.1.1.3 xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c:1.2
--- xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c:1.1.1.3 Sun Jun 2 08:23:46 2013
+++ xsrc/external/mit/xf86-video-mach64/dist/src/atimach64render.c Tue Nov 12 23:09:32 2013
@@ -339,10 +339,15 @@ Mach64GetOrder(int val, int *shift)
static Bool
Mach64CheckTexture(PicturePtr pPict)
{
- int w = pPict->pDrawable->width;
- int h = pPict->pDrawable->height;
+ int h, w;
int l2w, l2h, level, i;
+ if (pPict->pDrawable == NULL)
+ return FALSE;
+
+ w = pPict->pDrawable->width;
+ h = pPict->pDrawable->height;
+
for (i = 0; i < MACH64_NR_TEX_FORMATS; i++) {
if (Mach64TexFormats[i].pictFormat == pPict->format)
break;
