winemac: Fix redirection of OpenGL extension functions.

This never worked. opengl_funcs.ext.p_<func> would always be NULL at the time it was checked, so nothing would be changed. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Fix redirection of OpenGL extension functions.
6c6afb2c · Ken Thomases · Alexandre Julliard · 0fe00343 · 6c6afb2c
Commit 6c6afb2c authored Oct 17, 2019 by Ken Thomases Committed by Alexandre Julliard Oct 18, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

opengl.c dlls/winemac.drv/opengl.c +4 -4

No files found.
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -4277,6 +4277,9 @@ static BOOL init_opengl(void)
        }
    }

+    if (!init_gl_info())
+        goto failed;
+
    /* redirect some standard OpenGL functions */
 #define REDIRECT(func) \
    do { p##func = opengl_funcs.gl.p_##func; opengl_funcs.gl.p_##func = macdrv_##func; } while(0)
@@ -4292,13 +4295,10 @@ static BOOL init_opengl(void)

    /* redirect some OpenGL extension functions */
 #define REDIRECT(func) \
-    do { if (opengl_funcs.ext.p_##func) { p##func = opengl_funcs.ext.p_##func; opengl_funcs.ext.p_##func = macdrv_##func; } } while(0)
+    do { if ((p##func = wine_dlsym(opengl_handle, #func, NULL, 0))) { opengl_funcs.ext.p_##func = macdrv_##func; } } while(0)
    REDIRECT(glCopyColorTable);
 #undef REDIRECT

-    if (!init_gl_info())
-        goto failed;
-
    if (gluCheckExtension((GLubyte*)"GL_APPLE_flush_render", (GLubyte*)gl_info.glExtensions))
        pglFlushRenderAPPLE = wine_dlsym(opengl_handle, "glFlushRenderAPPLE", NULL, 0);