diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index d765b49b6..a0114c1ca 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -1133,6 +1133,7 @@ static void
 determineTextureTarget(XID glxDrawableID, CARD32 *attribs, CARD32 numAttribs)
 {
     GLenum target = 0;
+    GLenum format = 0;
     int i;
     __GLXdrawable *pGlxDraw;
 
@@ -1149,6 +1150,9 @@ determineTextureTarget(XID glxDrawableID, CARD32 *attribs, CARD32 numAttribs)
 		break;
 	    }
 	}
+
+	if (attribs[2 * i] == GLX_TEXTURE_FORMAT_EXT)
+		format = attribs[2 * i + 1];
     }
  
     if (!target) {
@@ -1161,6 +1165,7 @@ determineTextureTarget(XID glxDrawableID, CARD32 *attribs, CARD32 numAttribs)
     }
 
     pGlxDraw->target = target;
+    pGlxDraw->format = format;
 }
 
 int __glXDisp_CreateGLXPixmap(__GLXclientState *cl, GLbyte *pc)
diff --git a/glx/glxdrawable.h b/glx/glxdrawable.h
index 98e301b88..5856b91bc 100644
--- a/glx/glxdrawable.h
+++ b/glx/glxdrawable.h
@@ -91,6 +91,7 @@ struct __GLXdrawable {
     int refCount;
 
     GLenum target;
+    GLenum format;
 
     /*
     ** Event mask
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 9a3bc1fdb..7b814834f 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -221,9 +221,16 @@ __glXDRIbindTexImage(__GLXcontext *baseContext,
     if (texBuffer == NULL)
         return Success;
 
-    texBuffer->setTexBuffer(context->driContext,
-			    glxPixmap->target,
-			    drawable->driDrawable);
+    if (texBuffer->base.version >= 2 && texBuffer->setTexBuffer2 != NULL) {
+	(*texBuffer->setTexBuffer2)(context->driContext,
+				    glxPixmap->target,
+				    glxPixmap->format,
+				    drawable->driDrawable);
+    } else {
+	texBuffer->setTexBuffer(context->driContext,
+				glxPixmap->target,
+				drawable->driDrawable);
+    }
 
     return Success;
 }