xf86-video-mach64: Branch 'master'
Matthieu Herrb
herrb at kemper.freedesktop.org
Mon Jun 3 15:37:14 PDT 2013
src/atimach64render.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 2c83b465b336a012f2d2716940bf483358388000
Author: Matthieu Herrb <matthieu.herrb at laas.fr>
Date: Mon Jun 3 13:01:23 2013 -0400
Deal with pPict->pDrawable == NULL for source-only pictures.
Falling back to software rendering for such source pictures
(solid/gradient).
Signed-off-by: Matthieu Herrb <matthieu.herrb at laas.fr>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
diff --git a/src/atimach64render.c b/src/atimach64render.c
index ffde2cb..8d259fa 100644
--- a/src/atimach64render.c
+++ b/src/atimach64render.c
@@ -339,10 +339,13 @@ 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;
More information about the xorg-commit
mailing list