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

Timestamp:

May 22, 2014 11:42:21 AM (11 years ago)

Author:

vboxsync

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

93835

Message:

crOpenGL: saved state fixes, misc fixes

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_presenter.cpp (modified) (3 diffs)
• render/renderspu.c (modified) (2 diffs)
• render/renderspu.h (modified) (1 diff)
• render/renderspu_agl.c (modified) (1 diff)
• render/renderspu_glx.c (modified) (2 diffs)
• render/renderspu_wgl.c (modified) (2 diffs)

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

@@ -4920 +4920 @@
     int rc;
     int cDisplays = 0, i;
+
     for (i = 0; i < cr_server.screenCount; ++i)
     {
@@ -4968 +4969 @@
             AssertRCReturn(rc, rc);
 
-            rc = SSMR3PutU32(pSSM, 0xffffffff);
-            AssertRCReturn(rc, rc);
-
-            rc = CrFbSaveState(hFb, pSSM);
+            rc = SSMR3PutU32(pSSM, hFb->ScreenInfo.u32StartOffset);
             AssertRCReturn(rc, rc);
 
             CR_FB_INFO *pFbInfo = &g_CrPresenter.aFbInfos[hFb->ScreenInfo.u32ViewIndex];
             rc = SSMR3PutMem(pSSM, pFbInfo->aTargetMap, sizeof (pFbInfo->aTargetMap));
+            AssertRCReturn(rc, rc);
+
+            rc = CrFbSaveState(hFb, pSSM);
             AssertRCReturn(rc, rc);
         }
@@ -5154 +5155 @@
             AssertRCReturn(rc, rc);
 
-            uint32_t offVram = 0;
-            rc = SSMR3GetU32(pSSM, &offVram);
+            rc = SSMR3GetU32(pSSM, &Screen.u32StartOffset);
             AssertRCReturn(rc, rc);
-            if (offVram != 0xffffffff)
+            if (Screen.u32StartOffset == 0xffffffff)
             {
                 WARN(("not expected offVram"));
-                Screen.u32StartOffset = offVram;
+                Screen.u32StartOffset = 0;
             }
 
-            rc = CrFbLoadState(pFb, pSSM, version);
-            AssertRCReturn(rc, rc);
-
-            if (version >= SHCROGL_SSM_VERSION_WITH_SCREEN_MAP)
+            if (version >= SHCROGL_SSM_VERSION_WITH_SCREEN_MAP_REORDERED)
             {
                 rc = SSMR3GetMem(pSSM, aTargetMap, sizeof (aTargetMap));
                 AssertRCReturn(rc, rc);
             }
+
+            if (version == SHCROGL_SSM_VERSION_WITH_SCREEN_MAP)
+            {
+                VBOXCMDVBVA_SCREENMAP_DECL(uint32_t, aEmptyTargetMap);
+
+                memset(aEmptyTargetMap, 0, sizeof (aEmptyTargetMap));
+
+                rc = CrPMgrResize(&Screen, cr_server.fCrCmdEnabled ? NULL : CrFbGetVRAM(pFb), aEmptyTargetMap);
+                AssertRCReturn(rc, rc);
+
+                rc = CrFbLoadState(pFb, pSSM, version);
+                AssertRCReturn(rc, rc);
+
+                rc = SSMR3GetMem(pSSM, aTargetMap, sizeof (aTargetMap));
+                AssertRCReturn(rc, rc);
+            }
         }
 
         rc = CrPMgrResize(&Screen, cr_server.fCrCmdEnabled ? NULL : CrFbGetVRAM(pFb), aTargetMap);
         AssertRCReturn(rc, rc);
+
+        if (version >= SHCROGL_SSM_VERSION_WITH_FB_INFO && version != SHCROGL_SSM_VERSION_WITH_SCREEN_MAP)
+        {
+            rc = CrFbLoadState(pFb, pSSM, version);
+            AssertRCReturn(rc, rc);
+        }
     }
 

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

@@ -946 +946 @@
 }
 
-PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData )
-{
-    PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGet(window);
+PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData, bool fRedraw )
+{
+    PCR_BLITTER pBlitter = fRedraw ? window->pBlitter : renderspuVBoxPresentBlitterGet(window);
     if (pBlitter)
     {
@@ -1001 +1001 @@
 }
 
-void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData )
-{
-    PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGetAndEnter(window, i32MakeCurrentUserData);
+void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor,
+        const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData,
+        bool fRedraw )
+{
+    PCR_BLITTER pBlitter = renderspuVBoxPresentBlitterGetAndEnter(window, i32MakeCurrentUserData, fRedraw);
     if (!pBlitter)
         return;

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

@@ -418 +418 @@
 extern int renderspuVBoxCompositorTryAcquire(WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR **ppCompositor);
 extern void renderspuVBoxCompositorRelease( WindowInfo *window);
-extern void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData );
+extern void renderspuVBoxPresentCompositionGeneric( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor,
+        const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry, int32_t i32MakeCurrentUserData,
+        bool fRedraw);
 extern PCR_BLITTER renderspuVBoxPresentBlitterGet( WindowInfo *window );
 void renderspuVBoxPresentBlitterCleanup( WindowInfo *window );
 extern int renderspuVBoxPresentBlitterEnter( PCR_BLITTER pBlitter, int32_t i32MakeCurrentUserData );
-extern PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData );
+extern PCR_BLITTER renderspuVBoxPresentBlitterGetAndEnter( WindowInfo *window, int32_t i32MakeCurrentUserData, bool fRedraw );
 extern PCR_BLITTER renderspuVBoxPresentBlitterEnsureCreated( WindowInfo *window, int32_t i32MakeCurrentUserData );
 void renderspuWindowTermBase( WindowInfo *window );

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

@@ -610 +610 @@
 void renderspu_SystemVBoxPresentComposition( WindowInfo *window, const struct VBOXVR_SCR_COMPOSITOR * pCompositor, const struct VBOXVR_SCR_COMPOSITOR_ENTRY *pChangedEntry )
 {
-    renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
+    renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
 }
 

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

@@ -584 +584 @@
                         if (pCompositor)
                         {
-                            renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 0);
+                            renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 0, true);
                             renderspuVBoxCompositorRelease(pWindow);
                         }
@@ -1981 +1981 @@
     if (RT_SUCCESS(rc))
     {
-        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
+        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
         renderspuVBoxCompositorRelease(window);
     }

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

@@ -446 +446 @@
                         pWindow->redraw_device_context = hDC;
 
-                        renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 1);
+                        renderspuVBoxPresentCompositionGeneric(pWindow, pCompositor, NULL, 1, true);
 
                         bRc = EndPaint(pWindow->hWnd, &Paint);
@@ -1295 +1295 @@
     if (RT_SUCCESS(rc))
     {
-        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0);
+        renderspuVBoxPresentCompositionGeneric(window, pCompositor, pChangedEntry, 0, false);
         renderspuVBoxCompositorRelease(window);
     }