From f7b71451231c75c36771e8b7b0d78f05e0d50f65 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Sat, 19 Dec 2015 15:29:14 -0500 Subject: [PATCH] glx/dri3: a drawable might not be bound at wait time MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit A trace of Alien Isolation hit this on nouveau. Signed-off-by: Ilia Mirkin Reviewed-and-Tested-by: Michel Dänzer Cc: "11.0 11.1" --- src/glx/dri3_glx.c | 6 ++++-- 1 file 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); } /** -- 2.30.2