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

Timestamp:

Nov 11, 2024 7:51:58 PM (3 months ago)

Author:

vboxsync

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

165868

Message:

3D: Initialise only MAP and GBO interfaces if VMSVGA2dGBO extradata is set. bugref:10580

File:

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

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

@@ -6704 +6704 @@
         VMSVGA3DINTERFACE *p = &a3dInterface[i];
 
+        if (pThis->svga.fVMSVGA2dGBO &&
+            RTStrCmp(p->pcszName, VMSVGA3D_BACKEND_INTERFACE_NAME_MAP) &&
+            RTStrCmp(p->pcszName, VMSVGA3D_BACKEND_INTERFACE_NAME_GBO))
+        {
+            continue;
+        }
+
         int rc2 = pBackend->pfnQueryInterface(pThisCC, p->pcszName, NULL, p->cbFuncs);
         if (RT_SUCCESS(rc2))
@@ -6792 +6799 @@
 
 # ifdef VBOX_WITH_VMSVGA3D
-  if (pThisCC->svga.pSvgaR3State->pFuncs3D)
+    if (pThisCC->svga.pSvgaR3State->pFuncs3D)
         *pu32DeviceCaps |= SVGA_CAP_3D;
 # endif
@@ -7074 +7081 @@
     RT_ZERO(au32FailedCapsBitmap);
 
-    for (unsigned i = 0; i < RT_ELEMENTS(pThis->svga.au32DevCaps); ++i)
-    {
-        uint32_t val = 0;
-        int rc = vmsvga3dQueryCaps(pThisCC, (SVGA3dDevCapIndex)i, &val);
-        if (RT_SUCCESS(rc))
-            pThis->svga.au32DevCaps[i] = val;
-        else
-        {
-            ASMBitSet(au32FailedCapsBitmap, i);
-            pThis->svga.au32DevCaps[i] = 0;
-        }
-    }
-
-    vmsvgaR3Censor3DCaps(pThis, pThisCC);
+    if (!pThis->svga.fVMSVGA2dGBO)
+    {
+        for (unsigned i = 0; i <= RT_ELEMENTS(pThis->svga.au32DevCaps); ++i)
+        {
+            uint32_t val = 0;
+            int rc = vmsvga3dQueryCaps(pThisCC, (SVGA3dDevCapIndex)i, &val);
+            if (RT_SUCCESS(rc))
+                pThis->svga.au32DevCaps[i] = val;
+            else
+            {
+                ASMBitSet(au32FailedCapsBitmap, i);
+                pThis->svga.au32DevCaps[i] = 0;
+            }
+        }
+
+        vmsvgaR3Censor3DCaps(pThis, pThisCC);
+    }
+    else
+    {
+        pThis->svga.au32DevCaps[SVGA3D_DEVCAP_MAX_TEXTURE_WIDTH]  = 4096;
+        pThis->svga.au32DevCaps[SVGA3D_DEVCAP_MAX_TEXTURE_HEIGHT] = 4096;
+        pThis->svga.au32DevCaps[SVGA3D_DEVCAP_DXFMT_X8R8G8B8] = 0x3f7;
+    }
 
     bool const fSavedBuffering = RTLogRelSetBuffering(true);
@@ -7692 +7708 @@
     if (pThis->svga.f3DEnabled || pThis->svga.fVMSVGA2dGBO)
     {
+        int rc = VINF_SUCCESS;
+
         PVMSVGAR3STATE pSVGAState = pThisCC->svga.pSvgaR3State;
-        int rc = pSVGAState->pFuncs3D->pfnPowerOn(pDevIns, pThis, pThisCC);
+        if (pSVGAState->pFuncs3D)
+            rc = pSVGAState->pFuncs3D->pfnPowerOn(pDevIns, pThis, pThisCC);
+
         if (RT_SUCCESS(rc))
         {