removed problem with OpenGL extensions under X11

Daniel Skorka skorka at gmx.net
Thu Nov 20 16:50:13 CST 2003


This patch fixes a problem with bad OpenGL libraries wich uncorrectly
report the Extensions they support. Those libs would incorrectly report
not supporting glXGetProcAddresARB, on which wine relies for OpenGL
extension support. The problem was noticed with libGL from XFree86 4.2
under Linux x86.

ChangeLog:
* dlls/opengl32/wgl.c:
Daniel Skorka <skorka at gmx.net>
Fixed a problem using glXGetProcAddresARB with bad OpenGL libs.

---snip---
? patch.diff
? miscemu/Makefile
Index: dlls/opengl32/wgl.c
===================================================================
RCS file: /home/wine/wine/dlls/opengl32/wgl.c,v
retrieving revision 1.39
diff -u -u -r1.39 wgl.c
--- dlls/opengl32/wgl.c	17 Sep 2003 20:04:25 -0000	1.39
+++ dlls/opengl32/wgl.c	20 Nov 2003 22:33:51 -0000
@@ -671,12 +671,12 @@
   XFree(vis);
   LEAVE_GL();
 
-  if ((extensions != NULL) && (strstr(extensions, "GLX_ARB_get_proc_address"))) {
-    opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, NULL, 0);
-    if (opengl_handle != NULL) {
-      p_glXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0);
-      wine_dlclose(opengl_handle, NULL, 0);
-    }
+  opengl_handle = wine_dlopen(SONAME_LIBGL, RTLD_NOW|RTLD_GLOBAL, NULL, 0);
+  if (opengl_handle != NULL) {
+   p_glXGetProcAddressARB = wine_dlsym(opengl_handle, "glXGetProcAddressARB", NULL, 0);
+   wine_dlclose(opengl_handle, NULL, 0);
+   if (p_glXGetProcAddressARB == NULL)
+	   TRACE("could not find glXGetProcAddressARB in libGL.\n");
   }
   
   if (default_cx == NULL) {
---snip---



More information about the wine-patches mailing list