[PATCH 0/1] MR8109: winemac: Ensure pglGetString is initialized before calling init_gl_info().

[Huw Davies (＠huw)]

Fixes: 8e2ef6042a2ac39ace1a80d19e307bca1b8a2d91

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8109

[PATCH 1/1] winemac: Ensure pglGetString is initialized before calling init_gl_info().

[Huw Davies]

From: Huw Davies <huw(a)codeweavers.com>

Fixes: 8e2ef6042a2ac39ace1a80d19e307bca1b8a2d91
---
 dlls/winemac.drv/opengl.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index 0fc78f247c7..e9a937cfc37 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -2803,9 +2803,6 @@ UINT macdrv_OpenGLInit(UINT version, struct opengl_funcs **funcs, const struct o
         return STATUS_NOT_SUPPORTED;
     }
 
-    if (!init_gl_info())
-        goto failed;
-
 #define LOAD_FUNCPTR(func) \
         if (!(p##func = dlsym(opengl_handle, #func))) \
         { \
@@ -2819,6 +2816,10 @@ UINT macdrv_OpenGLInit(UINT version, struct opengl_funcs **funcs, const struct o
     LOAD_FUNCPTR(glViewport);
     LOAD_FUNCPTR(glCopyColorTable);
     LOAD_FUNCPTR(glFlush);
+
+    if (!init_gl_info())
+        goto failed;
+
     if (gluCheckExtension((GLubyte*)"GL_APPLE_flush_render", (GLubyte*)gl_info.glExtensions))
         LOAD_FUNCPTR(glFlushRenderAPPLE);
 #undef LOAD_FUNCPTR
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8109

[Rémi Bernon]

Indeed, I had a FIXME tag on that commit at some point, but after a couple of iterations I couldn't remember why it was there, and sent it anyway... :3

Thanks!

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8109#note_104096

[PATCH 0/1] MR8109: winemac: Ensure pglGetString is initialized before calling init_gl_info(). - approved

[Rémi Bernon]

This merge request was approved by Rémi Bernon.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8109