Changeset 38505 in vbox

Timestamp:

Aug 23, 2011 4:26:21 AM (13 years ago)

Author:

vboxsync

Message:

crOpenGL: fix incorrect rendering when switching to/from fullscreen with enabled 2d accel

Location:

trunk/src/VBox

Files:

• Frontends/VirtualBox/Makefile.kmk (modified) (1 diff)
• Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/crserver/crservice.cpp (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (2 diffs)
• HostServices/SharedOpenGL/render/renderspu_wgl.c (modified) (1 diff)
• Main/src-client/DisplayImpl.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -145 +145 @@
 else ifdef VBOX_GUI_USE_QGL
  VirtualBox_DEFS        += VBOX_GUI_USE_QGL
+endif
+ifdef VBOX_WITH_CROGL
+ VirtualBox_DEFS        += VBOX_WITH_CROGL
 endif
 ifdef VBOX_WITH_VIRTIO

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp

@@ -486 +486 @@
             Assert(m_pFrameBuffer == uisession()->frameBuffer(screenId()));
             m_pFrameBuffer->setView(NULL);
+#ifdef VBOX_WITH_CROGL
+            /* Call SetFramebuffer to ensure 3D gets notified of view being destroyed */
+            CDisplay display = session().GetConsole().GetDisplay();
+            display.SetFramebuffer(m_uScreenId, CFramebuffer(m_pFrameBuffer));
+#endif
         }
         else

trunk/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

@@ -1353 +1353 @@
                 {
                     CHECK_ERROR_RET(pFramebuffer, COMGETTER(WinId)(&winId), rc);
-                    CHECK_ERROR_RET(pFramebuffer, COMGETTER(Width)(&w), rc);
-                    CHECK_ERROR_RET(pFramebuffer, COMGETTER(Height)(&h), rc);
-
-                    rc = crVBoxServerMapScreen(screenId, xo, yo, w, h, winId);
-                    AssertRCReturn(rc, rc);
+
+                    if (!winId)
+                    {
+                        /* View associated with framebuffer is destroyed, happens with 2d accel enabled */
+                        rc = crVBoxServerUnmapScreen(screenId);
+                        AssertRCReturn(rc, rc);
+                    }
+                    else
+                    {
+                        CHECK_ERROR_RET(pFramebuffer, COMGETTER(Width)(&w), rc);
+                        CHECK_ERROR_RET(pFramebuffer, COMGETTER(Height)(&h), rc);
+
+                        rc = crVBoxServerMapScreen(screenId, xo, yo, w, h, winId);
+                        AssertRCReturn(rc, rc);
+                    }
                 }
 

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c

@@ -1157 +1157 @@
 DECLEXPORT(int32_t) crVBoxServerUnmapScreen(int sIndex)
 {
+    crDebug("crVBoxServerUnmapScreen(%i)", sIndex);
+
     if (sIndex<0 || sIndex>=cr_server.screenCount)
         return VERR_INVALID_PARAMETER;
@@ -1174 +1176 @@
 DECLEXPORT(int32_t) crVBoxServerMapScreen(int sIndex, int32_t x, int32_t y, uint32_t w, uint32_t h, uint64_t winID)
 {
-    crDebug("crVBoxServerMapScreen(%i) [%i,%i:%u,%u]", sIndex, x, y, w, h);
+    crDebug("crVBoxServerMapScreen(%i) [%i,%i:%u,%u %x]", sIndex, x, y, w, h, winID);
 
     if (sIndex<0 || sIndex>=cr_server.screenCount)

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

@@ -87 +87 @@
 
         case WM_DESTROY:
-            crDebug( "Render SPU: caught WM_DESTROY for our window" );
+            crDebug("Render SPU: caught WM_DESTROY for our window %x", hWnd);
             break;
 

trunk/src/VBox/Main/src-client/DisplayImpl.cpp

@@ -2991 +2991 @@
         /* Setup the new framebuffer, the resize will lead to an updateDisplayData call. */
         DISPLAYFBINFO *pFBInfo = &that->maFramebuffers[uScreenId];
+
+#if defined(VBOX_WITH_CROGL)
+        /* Leave the lock, because SHCRGL_HOST_FN_SCREEN_CHANGED will read current framebuffer */
+        {
+            BOOL is3denabled;
+            that->mParent->machine()->COMGETTER(Accelerate3DEnabled)(&is3denabled);
+
+            if (is3denabled)
+            {
+                alock.leave ();
+            }
+        }
+#endif
 
         if (pFBInfo->fVBVAEnabled && pFBInfo->pu8FramebufferVRAM)