Changeset 98783 in vbox for trunk

Timestamp:

Feb 28, 2023 3:00:59 PM (22 months ago)

Author:

vboxsync

Message:

Devices/Graphics: correctly load a saved state which has no surfaces or contexts

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-savedstate.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-dx-savedstate.cpp

@@ -222 +222 @@
      * Surfaces
      */
-    p3dState->papSurfaces = (PVMSVGA3DSURFACE *)RTMemAlloc(p3dState->cSurfaces * sizeof(PVMSVGA3DSURFACE));
-    AssertReturn(p3dState->papSurfaces, VERR_NO_MEMORY);
-    for (uint32_t i = 0; i < p3dState->cSurfaces; ++i)
-    {
-        p3dState->papSurfaces[i] = (PVMSVGA3DSURFACE)RTMemAllocZ(sizeof(VMSVGA3DSURFACE));
-        AssertPtrReturn(p3dState->papSurfaces[i], VERR_NO_MEMORY);
-        p3dState->papSurfaces[i]->id = SVGA3D_INVALID_ID;
-    }
-
-    for (uint32_t i = 0; i < p3dState->cSurfaces; ++i)
-    {
-        rc = vmsvga3dDXLoadSurface(pHlp, pThisCC, pSSM);
-        AssertRCReturn(rc, rc);
-    }
+    if (p3dState->cSurfaces)
+    {
+        p3dState->papSurfaces = (PVMSVGA3DSURFACE *)RTMemAlloc(p3dState->cSurfaces * sizeof(PVMSVGA3DSURFACE));
+        AssertReturn(p3dState->papSurfaces, VERR_NO_MEMORY);
+        for (uint32_t i = 0; i < p3dState->cSurfaces; ++i)
+        {
+            p3dState->papSurfaces[i] = (PVMSVGA3DSURFACE)RTMemAllocZ(sizeof(VMSVGA3DSURFACE));
+            AssertPtrReturn(p3dState->papSurfaces[i], VERR_NO_MEMORY);
+            p3dState->papSurfaces[i]->id = SVGA3D_INVALID_ID;
+        }
+
+        for (uint32_t i = 0; i < p3dState->cSurfaces; ++i)
+        {
+            rc = vmsvga3dDXLoadSurface(pHlp, pThisCC, pSSM);
+            AssertRCReturn(rc, rc);
+        }
+    }
+    else
+        p3dState->papSurfaces = NULL;
 
     /*
      * DX contexts
      */
-    p3dState->papDXContexts = (PVMSVGA3DDXCONTEXT *)RTMemAlloc(p3dState->cDXContexts * sizeof(PVMSVGA3DDXCONTEXT));
-    AssertReturn(p3dState->papDXContexts, VERR_NO_MEMORY);
-    for (uint32_t i = 0; i < p3dState->cDXContexts; ++i)
-    {
-        p3dState->papDXContexts[i] = (PVMSVGA3DDXCONTEXT)RTMemAllocZ(sizeof(VMSVGA3DDXCONTEXT));
-        AssertPtrReturn(p3dState->papDXContexts[i], VERR_NO_MEMORY);
-        p3dState->papDXContexts[i]->cid = SVGA3D_INVALID_ID;
-    }
-
-    for (uint32_t i = 0; i < p3dState->cDXContexts; ++i)
-    {
-        rc = vmsvga3dDXLoadContext(pHlp, pThisCC, pSSM);
-        AssertRCReturn(rc, rc);
-    }
+    if (p3dState->cDXContexts)
+    {
+        p3dState->papDXContexts = (PVMSVGA3DDXCONTEXT *)RTMemAlloc(p3dState->cDXContexts * sizeof(PVMSVGA3DDXCONTEXT));
+        AssertReturn(p3dState->papDXContexts, VERR_NO_MEMORY);
+        for (uint32_t i = 0; i < p3dState->cDXContexts; ++i)
+        {
+            p3dState->papDXContexts[i] = (PVMSVGA3DDXCONTEXT)RTMemAllocZ(sizeof(VMSVGA3DDXCONTEXT));
+            AssertPtrReturn(p3dState->papDXContexts[i], VERR_NO_MEMORY);
+            p3dState->papDXContexts[i]->cid = SVGA3D_INVALID_ID;
+        }
+
+        for (uint32_t i = 0; i < p3dState->cDXContexts; ++i)
+        {
+            rc = vmsvga3dDXLoadContext(pHlp, pThisCC, pSSM);
+            AssertRCReturn(rc, rc);
+        }
+    }
+    else
+        p3dState->papDXContexts = NULL;
 
     if (pSvgaR3State->idDXContextCurrent != SVGA_ID_INVALID)