Rebase against 7ca2f577e43a6ecea8c2362d347722f00ef14cb1.

patches/winemac.drv-no-flicker-patch/0001-winemac.drv-No-Flicker-patch.patch

@@ -1,4 +1,4 @@
-From 2d72a65d874538ec1032adaf42a28940e6b6a375 Mon Sep 17 00:00:00 2001
+From e5d0192701391f2526433392c52cde0f51745878 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
@@ -10,10 +10,10 @@ 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 f9ada39d38a..89ffa0d5825 100644
+index ac2a7853652..e05603a3694 100644
 --- a/dlls/winemac.drv/macdrv.h
 +++ b/dlls/winemac.drv/macdrv.h
-@@ -43,6 +43,7 @@
+@@ -42,6 +42,7 @@
  extern BOOL allow_vsync;
  extern BOOL allow_set_gamma;
  extern BOOL allow_software_rendering;
@@ -22,18 +22,18 @@ index f9ada39d38a..89ffa0d5825 100644
  extern UINT64 app_icon_callback;
  extern UINT64 app_quit_request_callback;
 diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
-index ea556aef68d..e67f17f9f43 100644
+index ed913834255..d951f456803 100644
 --- a/dlls/winemac.drv/macdrv_main.c
 +++ b/dlls/winemac.drv/macdrv_main.c
-@@ -59,6 +59,7 @@ int use_precise_scrolling = TRUE;
+@@ -58,6 +58,7 @@ bool use_precise_scrolling = true;
  int gl_surface_mode = GL_SURFACE_IN_FRONT_OPAQUE;
- int retina_enabled = FALSE;
- int enable_app_nap = FALSE;
+ bool retina_enabled = false;
+ bool enable_app_nap = false;
 +BOOL force_backing_store = FALSE;
  
  UINT64 app_icon_callback = 0;
  UINT64 app_quit_request_callback = 0;
-@@ -379,6 +380,9 @@ static void setup_options(void)
+@@ -372,6 +373,9 @@ static void setup_options(void)
      if (!get_config_key(hkey, appkey, "EnableAppNap", buffer, sizeof(buffer)))
          enable_app_nap = IS_OPTION_TRUE(buffer[0]);
  
@@ -44,10 +44,10 @@ index ea556aef68d..e67f17f9f43 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 ac87cfc1313..68de39f49cd 100644
+index e60fc04a82e..5cf1b9fdcb1 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
+@@ -1395,7 +1395,7 @@ static BOOL create_context(struct macdrv_context *context, CGLContextObj share,
          attribs[n++] = pf->samples;
      }
  
@@ -57,5 +57,5 @@ index ac87cfc1313..68de39f49cd 100644
  
      if (core)
 -- 
-2.45.2
+2.51.0
 

staging/upstream-commit

@@ -1 +1 @@
-b448a8ba7b619c082f639f1b61987bf5c0f322fd
+7ca2f577e43a6ecea8c2362d347722f00ef14cb1