summaryrefslogtreecommitdiff
path: root/src/glx/dri_common.c
diff options
context:
space:
mode:
authorHenri Verbeet <hverbeet@gmail.com>2011-07-18 00:42:27 +0200
committerHenri Verbeet <hverbeet@gmail.com>2011-07-19 23:27:46 +0200
commit0f20e2e18f902b4319851643e1775a18c2aacb3d (patch)
tree66929bf8012db0b250d8dd4d8fcb9404009b4b98 /src/glx/dri_common.c
parentf7dbcba280e4397cadb14f230aa925b4143cdde4 (diff)
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 <hverbeet@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> Tested-by: padfoot@exemail.com.au
Diffstat (limited to 'src/glx/dri_common.c')
-rw-r--r--src/glx/dri_common.c2
1 files changed, 1 insertions, 1 deletions
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)