Use glXGetProcAddress to resolve glx extensions

On systems where the GL driver is pluggable (like Mesa), we have to use
the glXGetProcAddressARB extension to resolve other function pointers as
the symbols wont be in the GL library, but rather in a plugin loaded by
the GL library.

This fix basically makes texture-from-pixmap work on Mesa drivers like
intel i915 & friends.

Reviewed-by: Trond

1 files changed, 8 insertions, 25 deletions

diff --git a/src/opengl/qglpixelbuffer_x11.cpp b/src/opengl/qglpixelbuffer_x11.cpp
index 793471d..6971133 100644
--- a/src/opengl/qglpixelbuffer_x11.cpp
+++ b/src/opengl/qglpixelbuffer_x11.cpp
@@ -93,6 +93,8 @@ static _glXMakeContextCurrent qt_glXMakeContextCurrent = 0;
 #define glXGetFBConfigAttrib qt_glXGetFBConfigAttrib
 #define glXMakeContextCurrent qt_glXMakeContextCurrent
 
+extern void* qglx_getProcAddress(const char* procName); // in qgl_x11.cpp
+
 static bool qt_resolve_pbuffer_extensions()
 {
     static int resolved = false;
@@ -101,31 +103,12 @@ static bool qt_resolve_pbuffer_extensions()
     else if (resolved)
         return false;
 
-#if defined(Q_OS_LINUX) || defined(Q_OS_BSD4)
-    void *handle = dlopen(NULL, RTLD_LAZY);
-    if (handle) {
-        qt_glXChooseFBConfig = (_glXChooseFBConfig) dlsym(handle, "glXChooseFBConfig");
-        qt_glXCreateNewContext = (_glXCreateNewContext) dlsym(handle, "glXCreateNewContext");
-        qt_glXCreatePbuffer = (_glXCreatePbuffer) dlsym(handle, "glXCreatePbuffer");
-        qt_glXDestroyPbuffer = (_glXDestroyPbuffer) dlsym(handle, "glXDestroyPbuffer");
-        qt_glXGetFBConfigAttrib = (_glXGetFBConfigAttrib) dlsym(handle, "glXGetFBConfigAttrib");
-        qt_glXMakeContextCurrent = (_glXMakeContextCurrent) dlsym(handle, "glXMakeContextCurrent");
-        dlclose(handle);
-    }
-    if (!qt_glXChooseFBConfig)
-#endif
-    {
-#if !defined(QT_NO_LIBRARY)
-        extern const QString qt_gl_library_name();
-        QLibrary gl(qt_gl_library_name());
-        qt_glXChooseFBConfig = (_glXChooseFBConfig) gl.resolve("glXChooseFBConfig");
-        qt_glXCreateNewContext = (_glXCreateNewContext) gl.resolve("glXCreateNewContext");
-        qt_glXCreatePbuffer = (_glXCreatePbuffer) gl.resolve("glXCreatePbuffer");
-        qt_glXDestroyPbuffer = (_glXDestroyPbuffer) gl.resolve("glXDestroyPbuffer");
-        qt_glXGetFBConfigAttrib = (_glXGetFBConfigAttrib) gl.resolve("glXGetFBConfigAttrib");
-        qt_glXMakeContextCurrent = (_glXMakeContextCurrent) gl.resolve("glXMakeContextCurrent");
-#endif
-    }
+    qt_glXChooseFBConfig = (_glXChooseFBConfig) qglx_getProcAddress("glXChooseFBConfig");
+    qt_glXCreateNewContext = (_glXCreateNewContext) qglx_getProcAddress("glXCreateNewContext");
+    qt_glXCreatePbuffer = (_glXCreatePbuffer) qglx_getProcAddress("glXCreatePbuffer");
+    qt_glXDestroyPbuffer = (_glXDestroyPbuffer) qglx_getProcAddress("glXDestroyPbuffer");
+    qt_glXGetFBConfigAttrib = (_glXGetFBConfigAttrib) qglx_getProcAddress("glXGetFBConfigAttrib");
+    qt_glXMakeContextCurrent = (_glXMakeContextCurrent) qglx_getProcAddress("glXMakeContextCurrent");
 
     resolved = qt_glXMakeContextCurrent ? true : false;
     return resolved;