diff --git a/src/glx/dri2_glx.c b/src/glx/dri2_glx.c
index dc69b1d38ee..1697a213615 100644
--- a/src/glx/dri2_glx.c
+++ b/src/glx/dri2_glx.c
@@ -818,18 +818,10 @@ dri2_bind_tex_image(__GLXDRIdrawable *base,
    if (pdraw != NULL) {
       psc = (struct dri2_screen *) base->psc;
 
-      if (psc->texBuffer->base.version >= 2 &&
-	  psc->texBuffer->setTexBuffer2 != NULL) {
-	 psc->texBuffer->setTexBuffer2(gc->driContext,
-					   pdraw->base.textureTarget,
-					   pdraw->base.textureFormat,
-					   pdraw->driDrawable);
-      }
-      else {
-	 psc->texBuffer->setTexBuffer(gc->driContext,
-					  pdraw->base.textureTarget,
-					  pdraw->driDrawable);
-      }
+      psc->texBuffer->setTexBuffer2(gc->driContext,
+                                    pdraw->base.textureTarget,
+                                    pdraw->base.textureFormat,
+                                    pdraw->driDrawable);
    }
 }
 
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c
index daf23af493a..91e96173ab8 100644
--- a/src/glx/drisw_glx.c
+++ b/src/glx/drisw_glx.c
@@ -488,18 +488,10 @@ drisw_bind_tex_image(__GLXDRIdrawable *base,
       if (!psc->texBuffer)
          return;
 
-      if (psc->texBuffer->base.version >= 2 &&
-          psc->texBuffer->setTexBuffer2 != NULL) {
-         psc->texBuffer->setTexBuffer2(gc->driContext,
-                                       pdraw->base.textureTarget,
-                                       pdraw->base.textureFormat,
-                                       pdraw->driDrawable);
-      }
-      else {
-         psc->texBuffer->setTexBuffer(gc->driContext,
-                                      pdraw->base.textureTarget,
-                                      pdraw->driDrawable);
-      }
+      psc->texBuffer->setTexBuffer2(gc->driContext,
+                                    pdraw->base.textureTarget,
+                                    pdraw->base.textureFormat,
+                                    pdraw->driDrawable);
    }
 }