Changeset 44922 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Mar 5, 2013 10:36:38 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL/OSX: synch window reshape

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (1 diff)
• renderspu.h (modified) (1 diff)
• renderspu_cocoa_helper.m (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -916 +916 @@
     }
     return NULL;
+}
+
+int renderspuVBoxCompositorLock(WindowInfo *window)
+{
+    int rc = RTCritSectEnter(&window->CompositorLock);
+    AssertRC(rc);
+    return rc;
+}
+
+int renderspuVBoxCompositorUnlock(WindowInfo *window)
+{
+    int rc = RTCritSectLeave(&window->CompositorLock);
+    AssertRC(rc);
+    return rc;
 }
 

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.h

@@ -395 +395 @@
 extern void renderspuVBoxCompositorSet( WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR * pCompositor);
 extern void renderspuVBoxCompositorClearAll();
+extern int renderspuVBoxCompositorLock(WindowInfo *window);
+extern int renderspuVBoxCompositorUnlock(WindowInfo *window);
 extern struct VBOXVR_SCR_COMPOSITOR * renderspuVBoxCompositorAcquire( WindowInfo *window);
 extern int renderspuVBoxCompositorTryAcquire(WindowInfo *window, struct VBOXVR_SCR_COMPOSITOR **ppCompositor);

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m

@@ -267 +267 @@
 - (void)updateViewportCS;
 - (void)reshape;
+- (void)reshapeLocked;
 
 - (void)createDockTile;
@@ -841 +842 @@
 }
 
-- (void)reshape
+- (void)reshapeLocked
 {
     NSRect parentFrame = NSZeroRect;
@@ -906 +907 @@
     {
         [self performSelectorMakingCurrent:m_pSharedGLCtx idSel:@selector(updateViewportCS)];
+    }
+}
+
+- (void)reshape
+{
+    int rc = renderspuVBoxCompositorLock(m_pWinInfo);
+    if (RT_SUCCESS(rc))
+    {
+        [self reshapeLocked];
+        renderspuVBoxCompositorUnlock(m_pWinInfo);
     }
 }