Changeset 51975 in vbox for trunk/src/VBox

Timestamp:

Jul 10, 2014 3:48:05 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94898

Message:

crOpenGL/OSX: fix garbage on resize

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/render/renderspu.c (modified) (2 diffs)
• src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m (modified) (3 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -2514 +2514 @@
                     /* this is a cleanup operation
                      * empty compositor is guarantid to be released on VBoxPresentComposition return */
-                    cr_server.head_spu->dispatch_table.VBoxPresentComposition(mSpuWindow, mpCompositor, NULL);
+                    cr_server.head_spu->dispatch_table.VBoxPresentComposition(mSpuWindow, &TmpCompositor, NULL);
                 }
                 g_pLed->Asserted.s.fWriting = 1;

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

@@ -1017 +1017 @@
      * no need to synch here
      * the lock is actually needed to ensure we're in synch with the redraw thread */
-    if (window->pCompositor == pCompositor && ! fEmpty)
+    if (window->pCompositor == pCompositor && !fEmpty)
         return !!pCompositor;
 
@@ -1031 +1031 @@
         }
 
-        window->pCompositor = pCompositor;
+        window->pCompositor = !fEmpty ? pCompositor : NULL;
         RTCritSectLeave(&window->CompositorLock);
         return fNeedPresent;

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

@@ -925 +925 @@
     DEBUG_MSG(("OVIW(%p): setSize: new size: %dx%d\n", (void*)self, (int)size.width, (int)size.height));
     [self performSelectorOnMainThread:@selector(vboxReshapeOnResizePerform) withObject:nil waitUntilDone:NO];
+
+    /* ensure window contents is updated after that */
+    [self setNeedsDisplay:YES];
 }
 
@@ -1273 +1276 @@
                 m_fNeedViewportUpdate = false;
             }
+            
+            m_fCleanupNeeded = GL_FALSE;
             
             /* Render FBO content to the dock tile when necessary. */
@@ -1946 +1951 @@
     NSAutoreleasePool *pPool = [[NSAutoreleasePool alloc] init];
 
-    [(OverlayView*)pView vboxNeedsEmptyPresent];
+    GLboolean fNeedsPresent = [(OverlayView*)pView vboxNeedsEmptyPresent];
 
     [pPool release];
+    
+    return fNeedsPresent;
 }