From 0f20e2e18f902b4319851643e1775a18c2aacb3d Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 18 Jul 2011 00:42:27 +0200 Subject: glx: Avoid calling __glXInitialize() in driReleaseDrawables(). This fixes a regression introduced by commit a26121f37530619610a78a5fbe5ef87e44047fda (fd.o bug #39219). Since the __glXInitialize() call should be unnecessary anyway, this is probably a nicer fix for the original problem too. NOTE: This is a candidate for the 7.10 and 7.11 branches. Signed-off-by: Henri Verbeet Reviewed-by: Ian Romanick Tested-by: padfoot@exemail.com.au --- src/glx/dri_common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/glx/dri_common.c') diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c index bac0c9e5911..e7dba5a68de 100644 --- a/src/glx/dri_common.c +++ b/src/glx/dri_common.c @@ -388,7 +388,7 @@ driFetchDrawable(struct glx_context *gc, GLXDrawable glxDrawable) _X_HIDDEN void driReleaseDrawables(struct glx_context *gc) { - struct glx_display *const priv = __glXInitialize(gc->psc->dpy); + const struct glx_display *priv = gc->psc->display; __GLXDRIdrawable *pdraw; if (priv == NULL) -- cgit v1.2.3