Revert "opengl32: Store alternative function in wglGetProcAddress."
authorAlexandre Julliard <julliard@winehq.org>
Sat, 12 Dec 2015 04:24:56 +0000 (05:24 +0100)
committerAlexandre Julliard <julliard@winehq.org>
Sat, 12 Dec 2015 04:24:56 +0000 (05:24 +0100)
This reverts commit e44f8eaa0fce02032e6c3f43052821f40eaba53b.
It mixes up the driver function and the WINAPI wrapper.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
dlls/opengl32/wgl.c

index 3b817a453af627f1a9cf4fd04dc76710a5333288..88aa564acbb01d4e0bd11309bafe49b3eb03786e 100644 (file)
@@ -884,15 +884,15 @@ PROC WINAPI wglGetProcAddress( LPCSTR name )
                 { "glCopyTexSubImage3DEXT", "glCopyTexSubImage3D" },  /* needed by RuneScape */
             };
 
-            WARN("Extension %s required for %s not supported\n", ext_ret->extension, name);
-            driver_func = NULL;
-
-            for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]) && !driver_func; i++)
+            for (i = 0; i < sizeof(alternatives)/sizeof(alternatives[0]); i++)
             {
                 if (strcmp( name, alternatives[i].name )) continue;
-                WARN("Trying alternative %s for %s\n", alternatives[i].alt, name );
-                driver_func = wglGetProcAddress( alternatives[i].alt );
+                WARN("Extension %s required for %s not supported, trying %s\n",
+                    ext_ret->extension, name, alternatives[i].alt );
+                return wglGetProcAddress( alternatives[i].alt );
             }
+            WARN("Extension %s required for %s not supported\n", ext_ret->extension, name);
+            return NULL;
         }
 
         if (driver_func == NULL)