Roderick Colenbrander : winex11.drv: Fix fbconfig regression.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9796aade282f26eec09887b807fd13ad41fb461d
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=9796aade282f26eec09887b8...

Author: Roderick Colenbrander 
Date:   Fri Sep 15 18:22:52 2006 +0200

winex11.drv: Fix fbconfig regression.

---

dlls/winex11.drv/opengl.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 8c10395..ebf34f8 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -410,17 +410,17 @@ #undef LOAD_FUNCPTR
     if ((!WineGLInfo.glxDirect && !strcmp("1.2", WineGLInfo.glxServerVersion)) ||
         (WineGLInfo.glxDirect && !strcmp("1.2", WineGLInfo.glxClientVersion)))
     {
-        pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfig");
-        pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib");
-        pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfig");
-    } else {
         if (NULL != strstr(glx_extensions, "GLX_SGIX_fbconfig")) {
             pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfigSGIX");
             pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttribSGIX");
             pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfigSGIX");
         } else {
-            ERR(" glx_version as %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", WineGLInfo.glxClientVersion);
+            ERR(" glx_version is %s and GLX_SGIX_fbconfig extension is unsupported. Expect problems.\n", WineGLInfo.glxClientVersion);
         }
+    } else {
+        pglXChooseFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXChooseFBConfig");
+        pglXGetFBConfigAttrib = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetFBConfigAttrib");
+        pglXGetVisualFromFBConfig = (void*)pglXGetProcAddressARB((const GLubyte *) "glXGetVisualFromFBConfig");
     }

/* The mesa libGL client library seems to forward glXQueryDrawable to the Xserver, so only