Changeset 106188 in vbox for trunk

Timestamp:

Oct 1, 2024 9:52:02 AM (7 months ago)

Author:

vboxsync

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

164972

Message:

3D: Conditionally enable 3D backend in 2D mode if VMSVGA2dGBO extradata is set (experimental change for testing purposes). ​bugref:10580

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (4 diffs)
• DevVGA-SVGA.h (modified) (1 diff)
• DevVGA.cpp (modified) (2 diffs)

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

@@ -4070 +4070 @@
                     else
                     {
-                        LogRelMax(8, ("VMSVGA: 3D disabled, command %d skipped\n", cmdId));
-                        break;
+                        if (pThis->svga.fVMSVGA2dGBO &&
+                            (cmdId == SVGA_3D_CMD_SET_OTABLE_BASE64 ||
+                            cmdId == SVGA_3D_CMD_DEFINE_GB_MOB64   ||
+                            cmdId == SVGA_3D_CMD_DESTROY_GB_MOB    ||
+                            cmdId == SVGA_3D_CMD_DEFINE_GB_SURFACE ||
+                            cmdId == SVGA_3D_CMD_DESTROY_GB_SURFACE ||
+                            cmdId == SVGA_3D_CMD_BIND_GB_SURFACE   ||
+                            cmdId == SVGA_3D_CMD_INVALIDATE_GB_SURFACE ||
+                            cmdId == SVGA_3D_CMD_DEFINE_GB_SCREENTARGET ||
+                            cmdId == SVGA_3D_CMD_DESTROY_GB_SCREENTARGET ||
+                            cmdId == SVGA_3D_CMD_BIND_GB_SCREENTARGET ||
+                            cmdId == SVGA_3D_CMD_UPDATE_GB_IMAGE      ||
+                            cmdId == SVGA_3D_CMD_UPDATE_GB_SCREENTARGET ||
+                            cmdId == SVGA_3D_CMD_SURFACE_COPY)
+                        )
+                        {
+                            LogRelMax(8, ("VMSVGA: 3D disabled, but command %d will be processed\n", cmdId));
+                        }
+                        else
+                        {
+                            LogRelMax(8, ("VMSVGA: 3D disabled, command %d skipped\n", cmdId));
+                            break;
+                        }
                     }
 
@@ -6771 +6792 @@
 
 # ifdef VBOX_WITH_VMSVGA3D
-    if (pThisCC->svga.pSvgaR3State->pFuncs3D)
+//  if (pThisCC->svga.pSvgaR3State->pFuncs3D)
+    if (pThis->svga.f3DEnabled)
         *pu32DeviceCaps |= SVGA_CAP_3D;
 # endif
@@ -7620 +7642 @@
 {
 # ifdef VBOX_WITH_VMSVGA3D
-    if (pThis->svga.f3DEnabled)
+    if (pThis->svga.f3DEnabled || pThis->svga.fVMSVGA2dGBO)
     {
         /* Load a 3D backend. */
@@ -7669 +7691 @@
 
 # ifdef VBOX_WITH_VMSVGA3D
-    if (pThis->svga.f3DEnabled)
+    if (pThis->svga.f3DEnabled || pThis->svga.fVMSVGA2dGBO)
     {
         PVMSVGAR3STATE pSVGAState = pThisCC->svga.pSvgaR3State;

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

@@ -363 +363 @@
     /** Whether MSAA support is enabled. */
     bool                        fVMSVGA3dMSAA;
-    bool                        afPadding[2];
+    bool                        fVMSVGA2dGBO;
+    bool                        afPadding[1];
     uint32_t                    uWidth;
     uint32_t                    uHeight;

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

@@ -6480 +6480 @@
                                             "|VMSVGA3dOverlayEnabled"
                                             "|VMSVGA3dMSAA"
+                                            "|VMSVGA2dGBO"
 # endif
                                             "|SuppressNewYearSplash"
@@ -6555 +6556 @@
     AssertLogRelRCReturn(rc, rc);
     Log(("VMSVGA: VMSVGA3dMSAA = %d\n", pThis->svga.fVMSVGA3dMSAA));
+
+    rc = pHlp->pfnCFGMQueryBoolDef(pCfg, "VMSVGA2dGBO", &pThis->svga.fVMSVGA2dGBO, false);
+    AssertLogRelRCReturn(rc, rc);
+    if (pThis->svga.f3DEnabled || pThis->fVMSVGAPciId == 0) /* The fVMSVGA2dGBO is for 2D mode of vmwgfx.ko only*/
+        pThis->svga.fVMSVGA2dGBO = false;
+    Log(("VMSVGA: fVMSVGA2dGBO = %d\n", pThis->svga.fVMSVGA2dGBO));
 # endif