Module: Mesa
Branch: 9.1
Commit: 18ef6b1265dcd83f511f287388f5e8533e97b35a
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=18ef6b1265dcd83f511f287388f5e8533e97b35a

Author: Jerome Glisse <[email protected]>
Date:   Fri Feb  8 18:57:42 2013 -0500

xorg: fix exa finish access

The exa core will already set the pointer to NULL prior calling
the callback function. So don't bail out in the callback if it's
already NULL.

Signed-off-by: Jerome Glisse <[email protected]>
(cherry picked from commit 3310acdf4756feb82bf043e7663b6dd8d6e3f7c9)

---

 src/gallium/state_trackers/xorg/xorg_exa.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c 
b/src/gallium/state_trackers/xorg/xorg_exa.c
index f010be6..3e764f8 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -318,7 +318,7 @@ ExaFinishAccess(PixmapPtr pPix, int index)
     if (!priv)
        return;
 
-    if (!priv->map_transfer || pPix->devPrivate.ptr == NULL)
+    if (!priv->map_transfer)
        return;
 
     exa_debug_printf("ExaFinishAccess %d\n", index);

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to