Changeset 50625 in vbox for trunk/src/VBox

Timestamp:

Feb 27, 2014 10:34:19 AM (11 years ago)

Author:

vboxsync

Message:

crOpenGL: misc bugfixes and cleanup

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server.h (modified) (1 diff)
• server_main.c (modified) (1 diff)
• server_muralfbo.cpp (modified) (1 diff)
• server_stream.c (modified) (1 diff)
• server_window.c (modified) (2 diffs)

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server.h

@@ -155 +155 @@
 HCR_FRAMEBUFFER CrPMgrFbGetFirstInitialized();
 HCR_FRAMEBUFFER CrPMgrFbGetNextInitialized(HCR_FRAMEBUFFER hFb);
+
+int CrFbRegionsClear(HCR_FRAMEBUFFER hFb);
 
 

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

@@ -2600 +2600 @@
     if (version >= SHCROGL_SSM_VERSION_WITH_SCREEN_INFO)
     {
-        HCR_FRAMEBUFFER hFb;
-
         rc = CrPMgrLoadState(pSSM, version);
         AssertRCReturn(rc, rc);

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

@@ -195 +195 @@
         {
             VBOXVR_TEXTURE Tex;
-            int rc;
             Tex.width = mural->width;
             Tex.height = mural->height;

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

@@ -281 +281 @@
         pNode->next = cr_server.pCleanupClient;
         cr_server.pCleanupClient = pNode;
+    }
+
+    if (!cr_server.numClients)
+    {
+        /* if no clients, the guest driver may be unloaded,
+         * and thus the visible regions situation might not be under control anymore,
+         * so cleanup the 3D framebuffer data here
+         * @todo: what really should happen is that guest driver on unload
+         * posts some request to host that would copy the current framebuffer 3D data to the 2D buffer
+         * (i.e. to the memory used by the standard IFramebuffer API) */
+        HCR_FRAMEBUFFER hFb;
+        for (hFb = CrPMgrFbGetFirstEnabled(); hFb; hFb = CrPMgrFbGetNextEnabled(hFb))
+        {
+            CrFbRegionsClear(hFb);
+        }
     }
 }

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

@@ -25 +25 @@
     GLint windowID = -1;
     GLint spuWindow;
-    int rc;
     GLint realVisBits = visBits;
 
@@ -182 +181 @@
         cr_server.head_spu->dispatch_table.MakeCurrent(dummyMural->spuWindow, 0, cr_server.MainContextInfo.SpuContext);
         cr_server.currentWindow = -1;
-        cr_server.currentMural = NULL;
+        cr_server.currentMural = dummyMural;
     }
     else