[PATCH 0/1] MR10185: winemac: Call client_surface_present when OpenGL surface gets presented.

[Rémi Bernon (＠rbernon)]

Making sure the surface client cocoa frame is associated as the
current client frame for the window.

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

[PATCH 1/1] winemac: Call client_surface_present when OpenGL surface gets presented.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

Making sure the surface client cocoa frame is associated as the
current client frame for the window.
---
 dlls/winemac.drv/opengl.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index e60fc04a82e..7040bbd5a8d 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -2020,6 +2020,11 @@ static void macdrv_surface_flush(struct opengl_drawable *base, UINT flags)
     if (!context) return;
     if (flags & GL_FLUSH_INTERVAL) set_swap_interval(context, base->interval);
     if (flags & GL_FLUSH_UPDATED) make_context_current(context, context->read_view == client->cocoa_view);
+    if (flags & GL_FLUSH_PRESENT)
+    {
+        macdrv_flush_opengl_context(context->context);
+        client_surface_present(base->client);
+    }
 }
 
 
@@ -2760,7 +2765,13 @@ static BOOL macdrv_surface_swap(struct opengl_drawable *base)
     TRACE("%s context %p/%p/%p\n", debugstr_opengl_drawable(base), context, (context ? context->context : NULL),
           (context ? context->cglcontext : NULL));
 
-    macdrv_flush_opengl_context(context->context);
+    if (context)
+    {
+        struct macdrv_client_surface *client = impl_from_client_surface(base->client);
+        make_context_current(context, context->read_view == client->cocoa_view);
+        macdrv_flush_opengl_context(context->context);
+    }
+    client_surface_present(base->client);
     return TRUE;
 }
 
-- 
GitLab

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