From a2170c577b7aa3b5bf1abc1d4e8cae473006f611 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Thu, 16 May 2024 08:29:53 +1000 Subject: [PATCH] Rebase against 849baece66e326bce255dfea0d6fb10df888bc55. --- .../0001-winemac.drv-No-Flicker-patch.patch | 18 +++++++++--------- staging/upstream-commit | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch b/patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch index 8e44036a..afb64dcb 100644 --- a/patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch +++ b/patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch @@ -1,4 +1,4 @@ -From 19d54067c5e9a44b4f4f319cd61232665f7fb01a Mon Sep 17 00:00:00 2001 +From ad91a015d40c8bea7dcb603ead7897e593ea173a Mon Sep 17 00:00:00 2001 From: Ken Thomases Date: Tue, 22 Jun 2021 07:56:43 +1000 Subject: [PATCH] winemac.drv: No Flicker patch @@ -10,7 +10,7 @@ Subject: [PATCH] winemac.drv: No Flicker patch 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 +index 19efc4dc7d4..2468d4219f6 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -44,6 +44,7 @@ @@ -22,20 +22,20 @@ index f5793006c35..0aa4d651d70 100644 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 +index 21b148ff558..3034fe2f780 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; +@@ -60,6 +60,7 @@ int use_precise_scrolling = TRUE; + 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]); +@@ -378,6 +379,9 @@ static void setup_options(void) + if (!get_config_key(hkey, appkey, "EnableAppNap", buffer, sizeof(buffer))) + enable_app_nap = IS_OPTION_TRUE(buffer[0]); + if (!get_config_key(hkey, appkey, "ForceOpenGLBackingStore", buffer, sizeof(buffer))) + force_backing_store = IS_OPTION_TRUE(buffer[0]); @@ -44,7 +44,7 @@ index acfad65ea81..aff0181e253 100644 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 +index 1c0b87d694a..b0a3e25fd73 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 diff --git a/staging/upstream-commit b/staging/upstream-commit index c15d0057..a94a0d10 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -6a31983779479b42e0c2e5320a1dfa962767c28e +849baece66e326bce255dfea0d6fb10df888bc55