[PATCH 3/6] Revert "winemac.drv: Move GL context update code to -viewWillDraw method."

Tim Clem tclem at codeweavers.com
Thu Apr 21 15:04:31 CDT 2022


This reverts commit cad2a7c8e1ad97eaf8bbb7479f8c5ad8dca8a10d.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52354
Signed-off-by: Tim Clem <tclem at codeweavers.com>
---
 dlls/winemac.drv/cocoa_window.m | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index ba7eaf2ad78..2014027d2cc 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -491,9 +491,9 @@ - (BOOL) isFlipped
         return YES;
     }
 
-    - (void) viewWillDraw
+    - (void) drawRect:(NSRect)rect
     {
-        [super viewWillDraw];
+        WineWindow* window = (WineWindow*)[self window];
 
         for (WineOpenGLContext* context in pendingGlContexts)
         {
@@ -506,11 +506,6 @@ - (void) viewWillDraw
         }
         [glContexts addObjectsFromArray:pendingGlContexts];
         [pendingGlContexts removeAllObjects];
-    }
-
-    - (void) drawRect:(NSRect)rect
-    {
-        WineWindow* window = (WineWindow*)[self window];
 
         if ([window contentView] != self)
             return;
-- 
2.34.1




More information about the wine-devel mailing list