From 19d54067c5e9a44b4f4f319cd61232665f7fb01a Mon Sep 17 00:00:00 2001
From: Ken Thomases <ken@codeweavers.com>
Date: Tue, 22 Jun 2021 07:56:43 +1000
Subject: [PATCH] winemac.drv: No Flicker patch

---
 dlls/winemac.drv/macdrv.h      | 1 +
 dlls/winemac.drv/macdrv_main.c | 4 ++++
 dlls/winemac.drv/opengl.c      | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h
index f5793006c35..0aa4d651d70 100644
--- a/dlls/winemac.drv/macdrv.h
+++ b/dlls/winemac.drv/macdrv.h
@@ -44,6 +44,7 @@
 extern BOOL allow_set_gamma;
 extern BOOL allow_software_rendering;
 extern BOOL disable_window_decorations;
+extern BOOL force_backing_store;
 
 extern const char* debugstr_cf(CFTypeRef t);
 
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index acfad65ea81..aff0181e253 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -61,6 +61,7 @@ int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE;
 int retina_enabled = FALSE;
 int enable_app_nap = FALSE;
 int eager_dock_icon_hiding = TRUE;
+BOOL force_backing_store = FALSE;
 
 CFDictionaryRef localized_strings;
 
@@ -382,6 +383,9 @@ static void setup_options(void)
     if (!get_config_key(hkey, appkey, "EagerDockIconHiding", buffer, sizeof(buffer)))
         eager_dock_icon_hiding = IS_OPTION_TRUE(buffer[0]);
 
+    if (!get_config_key(hkey, appkey, "ForceOpenGLBackingStore", buffer, sizeof(buffer)))
+        force_backing_store = IS_OPTION_TRUE(buffer[0]);
+
     /* Don't use appkey.  The DPI and monitor sizes should be consistent for all
        processes in the prefix. */
     if (!get_config_key(hkey, NULL, "RetinaMode", buffer, sizeof(buffer)))
diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c
index f78454ed149..205c0816d44 100644
--- a/dlls/winemac.drv/opengl.c
+++ b/dlls/winemac.drv/opengl.c
@@ -1451,7 +1451,7 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns
         attribs[n++] = pf->samples;
     }
 
-    if (pf->backing_store)
+    if (force_backing_store || pf->backing_store)
         attribs[n++] = kCGLPFABackingStore;
 
     if (core)
-- 
2.43.0