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

Timestamp:

May 19, 2021 8:41:10 PM (4 years ago)

Author:

vboxsync

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

144524

Message:

Devices/Graphics: Fixed 3D backend reset issues. bugref:9830

File:

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

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

@@ -423 +423 @@
 static int vmsvgaR3SaveExecFifo(PCPDMDEVHLPR3 pHlp, PVGASTATECC pThisCC, PSSMHANDLE pSSM);
 static void vmsvgaR3CmdBufSubmit(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC, RTGCPHYS GCPhysCB, SVGACBContext CBCtx);
-# ifdef VBOX_WITH_VMSVGA3D
-static void vmsvga3dR3Free3dInterfaces(PVGASTATECC pThisCC);
-# endif
 #endif /* IN_RING3 */
 
@@ -5760 +5757 @@
         RTCritSectDelete(&pSVGAState->CritSectCmdBuf);
     }
-
-# ifdef VBOX_WITH_VMSVGA3D
-    vmsvga3dR3Free3dInterfaces(pThisCC);
-# endif
 }
 
@@ -5834 +5827 @@
  * @param   pThisCC   The VGA/VMSVGA state for ring-3.
  */
-static int vmsvgaR3Init3dInterfaces(PVGASTATE pThis, PVGASTATECC pThisCC)
+static int vmsvgaR3Init3dInterfaces(PPDMDEVINS pDevIns, PVGASTATE pThis, PVGASTATECC pThisCC)
 {
 #ifndef VMSVGA3D_DX
@@ -5880 +5873 @@
         /* 3D interface is required. */
         if (pSVGAState->pFuncs3D)
-            return VINF_SUCCESS;
-
-        rc = VERR_NOT_SUPPORTED;
+        {
+            rc = pSVGAState->pFuncs3D->pfnInit(pDevIns, pThis, pThisCC);
+            if (RT_SUCCESS(rc))
+                return VINF_SUCCESS;
+        }
+        else
+            rc = VERR_NOT_SUPPORTED;
     }
 
@@ -6118 +6115 @@
         vmsvgaR3StateTerm(pThis, pThisCC);
 
+# ifdef VBOX_WITH_VMSVGA3D
+        vmsvga3dR3Free3dInterfaces(pThisCC);
+# endif
+
         RTMemFree(pThisCC->svga.pSvgaR3State);
         pThisCC->svga.pSvgaR3State = NULL;
@@ -6206 +6207 @@
     {
         /* Load a 3D backend. */
-        rc = vmsvgaR3Init3dInterfaces(pThis, pThisCC);
-        if (RT_SUCCESS(rc))
-            rc = pSVGAState->pFuncs3D->pfnInit(pDevIns, pThis, pThisCC);
-
+        rc = vmsvgaR3Init3dInterfaces(pDevIns, pThis, pThisCC);
         if (RT_FAILURE(rc))
         {