From: Eric Anholt <eric@anholt.net>
Date: Fri, 23 Jul 2010 21:51:06 +0000 (-0700)
Subject: glx: Correctly look up the dri2 context pointer for SetTexBuffer.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=566373967a6a63b6a9c85a2392bc827ac7ef679f;p=mesa.git

glx: Correctly look up the dri2 context pointer for SetTexBuffer.

gc->driContext points at the second member of the dri2 context.  The
dri2 context is just a subclass of the GLX context.

Fixes piglit tfp testcase.
---

diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index a94223b2a12..1dae589bd8e 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -647,13 +647,13 @@ dri2_bind_tex_image(Display * dpy,
 		    int buffer, const int *attrib_list)
 {
    GLXContext gc = __glXGetCurrentContext();
+   struct dri2_context *pcp = (struct dri2_context *) gc;
    __GLXDRIdrawable *base = GetGLXDRIDrawable(dpy, drawable);
    __GLXdisplayPrivate *dpyPriv = __glXInitialize(dpy);
    struct dri2_drawable *pdraw = (struct dri2_drawable *) base;
    struct dri2_display *pdp =
       (struct dri2_display *) dpyPriv->dri2Display;
    struct dri2_screen *psc = (struct dri2_screen *) base->psc;
-   struct dri2_context *pcp = (struct dri2_context *) gc->driContext;
 
    if (pdraw != NULL) {