summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlia Mirkin <[email protected]>2015-12-19 15:29:14 -0500
committerIlia Mirkin <[email protected]>2015-12-21 06:43:58 -0500
commitf7b71451231c75c36771e8b7b0d78f05e0d50f65 (patch)
treedb31105a4fed1eecd818895c753cd5525d8efbad
parent37186c43b55a773555af5ae15449ba6a076a71f3 (diff)
glx/dri3: a drawable might not be bound at wait time
A trace of Alien Isolation hit this on nouveau. Signed-off-by: Ilia Mirkin <[email protected]> Reviewed-and-Tested-by: Michel Dänzer <[email protected]> Cc: "11.0 11.1" <[email protected]>
-rw-r--r--src/glx/dri3_glx.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/glx/dri3_glx.c b/src/glx/dri3_glx.c
index ee243126731..8bdbb9caf56 100644
--- a/src/glx/dri3_glx.c
+++ b/src/glx/dri3_glx.c
@@ -437,7 +437,8 @@ dri3_wait_x(struct glx_context *gc)
struct dri3_drawable *priv = (struct dri3_drawable *)
GetGLXDRIDrawable(gc->currentDpy, gc->currentDrawable);
- loader_dri3_wait_x(&priv->loader_drawable);
+ if (priv)
+ loader_dri3_wait_x(&priv->loader_drawable);
}
static void
@@ -446,7 +447,8 @@ dri3_wait_gl(struct glx_context *gc)
struct dri3_drawable *priv = (struct dri3_drawable *)
GetGLXDRIDrawable(gc->currentDpy, gc->currentDrawable);
- loader_dri3_wait_gl(&priv->loader_drawable);
+ if (priv)
+ loader_dri3_wait_gl(&priv->loader_drawable);
}
/**