Changeset 85438 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jul 23, 2020 2:30:53 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Graphics: fixed a debug assertion caused by a missing if (f3DEnabled)

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -589 +589 @@
 }
 
-void vmsvgaR3ResetScreens(PVGASTATECC pThisCC)
+void vmsvgaR3ResetScreens(PVGASTATE pThis, PVGASTATECC pThisCC)
 {
 # ifdef VBOX_WITH_VMSVGA3D
-    for (uint32_t idScreen = 0; idScreen < (uint32_t)RT_ELEMENTS(pThisCC->svga.pSvgaR3State->aScreens); ++idScreen)
-    {
-        VMSVGASCREENOBJECT *pScreen = vmsvgaR3GetScreenObject(pThisCC, idScreen);
-        if (pScreen)
-            vmsvga3dDestroyScreen(pThisCC, pScreen);
+    if (pThis->svga.f3DEnabled)
+    {
+        for (uint32_t idScreen = 0; idScreen < (uint32_t)RT_ELEMENTS(pThisCC->svga.pSvgaR3State->aScreens); ++idScreen)
+        {
+            VMSVGASCREENOBJECT *pScreen = vmsvgaR3GetScreenObject(pThisCC, idScreen);
+            if (pScreen)
+                vmsvga3dDestroyScreen(pThisCC, pScreen);
+        }
     }
 # else
-    RT_NOREF(pThisCC);
+    RT_NOREF(pThis, pThisCC);
 # endif
 }
@@ -3107 +3110 @@
             Assert(pThisCC->svga.pvFIFOExtCmdParam == NULL);
 
-            vmsvgaR3ResetScreens(pThisCC);
+            vmsvgaR3ResetScreens(pThis, pThisCC);
 # ifdef VBOX_WITH_VMSVGA3D
             if (pThis->svga.f3DEnabled)
@@ -3122 +3125 @@
 
             /* The screens must be reset on the FIFO thread, because they may use 3D resources. */
-            vmsvgaR3ResetScreens(pThisCC);
+            vmsvgaR3ResetScreens(pThis, pThisCC);
             break;