Merge branch '7.8'

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

diff --git a/src/glx/dri_common.c b/src/glx/dri_common.c
index e4034161bb32c2ec07a6e8ba0b85a654ee7b7456..429fc6d89126d91cf495e713134d390bb79f12ed 100644 (file)
--- a/src/glx/dri_common.c
+++ b/src/glx/dri_common.c
@@ -33,7 +33,7 @@
  *   Kristian Høgsberg (krh@redhat.com)
  */
 
-#ifdef GLX_DIRECT_RENDERING
+#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
 
 #include <unistd.h>
 #include <dlfcn.h>
@@ -403,6 +403,11 @@ dri2BindExtensions(__GLXscreenConfigs *psc)
         /* internal driver extension, no GL extension exposed */
       }
 #endif
+
+#ifdef __DRI2_CONFIG_QUERY
+      if ((strcmp(extensions[i]->name, __DRI2_CONFIG_QUERY) == 0))
+        psc->config = (__DRI2configQueryExtension *) extensions[i];
+#endif
    }
 }