Chip Davis : winemac.drv: Move GL context update code to -viewWillDraw method.

Alexandre Julliard julliard at winehq.org
Wed Sep 1 15:45:10 CDT 2021


Module: wine
Branch: master
Commit: cad2a7c8e1ad97eaf8bbb7479f8c5ad8dca8a10d
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=cad2a7c8e1ad97eaf8bbb7479f8c5ad8dca8a10d

Author: Chip Davis <cdavis at codeweavers.com>
Date:   Wed Sep  1 09:28:22 2021 -0500

winemac.drv: Move GL context update code to -viewWillDraw method.

Signed-off-by: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/winemac.drv/cocoa_window.m | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 013af035a12..677dc07ae16 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -491,9 +491,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
         return YES;
     }
 
-    - (void) drawRect:(NSRect)rect
+    - (void) viewWillDraw
     {
-        WineWindow* window = (WineWindow*)[self window];
+        [super viewWillDraw];
 
         for (WineOpenGLContext* context in pendingGlContexts)
         {
@@ -506,6 +506,11 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
         }
         [glContexts addObjectsFromArray:pendingGlContexts];
         [pendingGlContexts removeAllObjects];
+    }
+
+    - (void) drawRect:(NSRect)rect
+    {
+        WineWindow* window = (WineWindow*)[self window];
 
         if ([window contentView] != self)
             return;




More information about the wine-cvs mailing list