Changeset 104907 in vbox for trunk/src/VBox/Devices

Timestamp:

Jun 12, 2024 7:13:44 PM (7 months ago)

Author:

vboxsync

Message:

Devices/Graphics: Split the initialization of 3D caps from writing them to FIFO. bugref:9830

File:

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

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

@@ -6768 +6768 @@
 # ifdef VBOX_WITH_VMSVGA3D
 /**
- * Initializes the host 3D capabilities and writes them to FIFO memory.
+ * Initializes the host 3D capabilities (pThis->svga.au32DevCaps).
  *
  * @returns VBox status code.
@@ -6774 +6774 @@
  * @param   pThisCC   The VGA/VMSVGA state for ring-3.
  */
-static void vmsvgaR3InitFifo3DCaps(PVGASTATE pThis, PVGASTATECC pThisCC)
+static void vmsvgaR3Init3DCaps(PVGASTATE pThis, PVGASTATECC pThisCC)
 {
     /* Query the capabilities and store them in the pThis->svga.au32DevCaps array. */
@@ -6820 +6820 @@
 
     RTLogRelSetBuffering(fSavedBuffering);
-
+}
+
+
+/**
+ * Write the host 3D capabilities to FIFO memory.
+ * Must be called after vmsvgaR3Init3DCaps.
+ *
+ * @returns VBox status code.
+ * @param   pThis     The shared VGA/VMSVGA instance data.
+ * @param   pThisCC   The VGA/VMSVGA state for ring-3.
+ */
+static void vmsvgaR3InitFIFO3D(PVGASTATE pThis, PVGASTATECC pThisCC)
+{
     /* 3d hardware version; latest and greatest */
     pThisCC->svga.pau32FIFO[SVGA_FIFO_3D_HWVERSION_REVISED] = SVGA3D_HWVERSION_CURRENT;
@@ -6849 +6861 @@
     pCaps->header.length = 0;
 }
-
-# endif
+# endif /* VBOX_WITH_VMSVGA3D */
 
 /**
@@ -6902 +6913 @@
 
 # ifdef VBOX_WITH_VMSVGA3D
-    if (   pThis->svga.f3DEnabled
-        && !pThis->fVmSvga3)
-        vmsvgaR3InitFifo3DCaps(pThis, pThisCC);
+    if (pThis->svga.f3DEnabled)
+    {
+        vmsvgaR3Init3DCaps(pThis, pThisCC);
+        if (!pThis->fVmSvga3)
+            vmsvgaR3InitFIFO3D(pThis, pThisCC);
+    }
 # endif
 
@@ -7378 +7392 @@
 
 # ifdef VBOX_WITH_VMSVGA3D
-    if (   pThis->svga.f3DEnabled
-        && !pThis->fVmSvga3)
+    if (pThis->svga.f3DEnabled)
     {
         PVMSVGAR3STATE pSVGAState = pThisCC->svga.pSvgaR3State;
@@ -7385 +7398 @@
         if (RT_SUCCESS(rc))
         {
-            /* Initialize FIFO 3D capabilities. */
-            vmsvgaR3InitFifo3DCaps(pThis, pThisCC);
+            /* Initialize 3D capabilities. */
+            vmsvgaR3Init3DCaps(pThis, pThisCC);
+            if (!pThis->fVmSvga3)
+                vmsvgaR3InitFIFO3D(pThis, pThisCC);
         }
         else