Changeset 44880 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/render

Timestamp:

Mar 1, 2013 9:09:26 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: resize fixes, more to follow

Location:

trunk/src/VBox/HostServices/SharedOpenGL/render

Files:

• renderspu.c (modified) (1 diff)
• renderspu_cocoa_helper.m (modified) (1 diff)

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

@@ -510 +510 @@
     window = (WindowInfo *) crHashtableSearch(render_spu.windowTable, win);
     if (window) {
-        renderspu_SystemWindowSize( window, w, h );
-        window->BltInfo.width  = w;
-        window->BltInfo.height = h;
+        if (w != window->BltInfo.width
+                || h != window->BltInfo.height)
+        {
+            /* window is resized, compositor data is no longer valid
+             * this set also ensures all redraw operations are done in the redraw thread
+             * and that no redraw is started until new Present request comes containing a valid presentation data */
+            renderspuVBoxCompositorSet( window, NULL);
+            renderspu_SystemWindowSize( window, w, h );
+            window->BltInfo.width  = w;
+            window->BltInfo.height = h;
+        }
     }
     else {

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

@@ -785 +785 @@
 - (void)setSize:(NSSize)size
 {
+    NSOpenGLContext *pCurCtx;
+    NSView *pCurView;
     m_Size = size;
 
-    {
-        DEBUG_MSG(("OVIW(%p): setSize: new size: %dx%d\n", (void*)self, (int)size.width, (int)size.height));
-        [self reshape];
-        [self createDockTile];
-        /* have to rebind GL_TEXTURE_RECTANGLE_ARB as m_FBOTexId could be changed in updateFBO call */
-        m_fNeedViewportUpdate = true;
+    DEBUG_MSG(("OVIW(%p): setSize: new size: %dx%d\n", (void*)self, (int)size.width, (int)size.height));
+    [self reshape];
+    [self createDockTile];
+    /* have to rebind GL_TEXTURE_RECTANGLE_ARB as m_FBOTexId could be changed in updateFBO call */
+    m_fNeedViewportUpdate = true;
+    pCurCtx = vboxCtxGetCurrent();
+    if (pCurCtx && pCurCtx == m_pGLCtx && (pCurView = [pCurCtx view]) == self)
+    {
+        [m_pGLCtx update];
+        m_fNeedCtxUpdate = false;
+    }
+    else
+    {
+        /* do it in a lazy way */
         m_fNeedCtxUpdate = true;
     }