xserver-xorg-video-mach64: Changes to 'debian-unstable'

[Julien Cristau <jcristau@moszumanska.debian.org>]

 debian/changelog      |    7 +++++++
 src/atimach64render.c |    7 +++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 0e8f5853f2c346aae378e4e297f2f170635ec2ce
Author: Julien Cristau <jcristau@debian.org>
Date:   Sun Jul 13 14:33:51 2014 +0200

    Upload to unstable

diff --git a/debian/changelog b/debian/changelog
index 200f797..00020dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-mach64 (6.9.4-2) unstable; urgency=medium
+
+  * Deal with pPict->pDrawable == NULL for source-only pictures [cherry-picked
+    from upstream git].  Closes: #726585.
+
+ -- Julien Cristau <jcristau@debian.org>  Sun, 13 Jul 2014 14:33:34 +0200
+
 xserver-xorg-video-mach64 (6.9.4-1) unstable; urgency=low
 
   [ Maarten Lankhorst ]

commit e1da140b88df5a73d6c951381932e32ae671c8c6
Author: Matthieu Herrb <matthieu.herrb@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@laas.fr>
    Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
    (cherry picked from commit 2c83b465b336a012f2d2716940bf483358388000)

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;