Merge remote branch 'origin/gallium-0.2' into gallium-0.2

[mesa.git] / src / glx / x11 / dri_common.c

diff --git a/src/glx/x11/dri_common.c b/src/glx/x11/dri_common.c
index b159d193a51a2bdb03d98f0c5c0094eaee8a55f4..fbce6ac3e3dee0a0a560ca0a0b2b9f5c4f8dc73b 100644 (file)
--- a/src/glx/x11/dri_common.c
+++ b/src/glx/x11/dri_common.c
@@ -37,7 +37,7 @@
 
 #include <unistd.h>
 #include <dlfcn.h>
-#include "glheader.h"
+#include <stdarg.h>
 #include "glxclient.h"
 #include "glcontextmodes.h"
 #include "dri_common.h"
@@ -329,7 +329,7 @@ driConvertConfigs(const __DRIcoreExtension *core,
 }
 
 _X_HIDDEN void
-driBindExtensions(__GLXscreenConfigs *psc)
+driBindExtensions(__GLXscreenConfigs *psc, int dri2)
 {
     const __DRIextension **extensions;
     int i;
@@ -386,7 +386,7 @@ driBindExtensions(__GLXscreenConfigs *psc)
 #endif
 
 #ifdef __DRI_TEX_BUFFER
-       if (strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) {
+       if ((strcmp(extensions[i]->name, __DRI_TEX_BUFFER) == 0) && dri2) {
            psc->texBuffer = (__DRItexBufferExtension *) extensions[i];
            __glXEnableDirectExtension(psc, "GLX_EXT_texture_from_pixmap");
        }