Changeset 86838 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

Timestamp:

Nov 9, 2020 11:16:50 PM (4 years ago)

Author:

vboxsync

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

141287

Message:

Devices/Graphics: A couple of new commands; a more generic handler for creating a surface; cleaned saved state data for a surface; increased saved state version; possibility to build DX11 backend. bugref:9830

File:

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

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-info.cpp

@@ -291 +291 @@
         for (uint32_t iFace = 0; iFace < pSurface->cFaces; iFace++)
         {
-            Assert(pSurface->faces[iFace].numMipLevels <= pSurface->faces[0].numMipLevels);
-            PVMSVGA3DMIPMAPLEVEL pMipmapLevel = &pSurface->paMipmapLevels[iFace * pSurface->faces[0].numMipLevels];
-            for (uint32_t i = 0; i < pSurface->faces[iFace].numMipLevels; i++, pMipmapLevel++)
+            PVMSVGA3DMIPMAPLEVEL pMipmapLevel = &pSurface->paMipmapLevels[iFace * pSurface->cLevels];
+            for (uint32_t i = 0; i < pSurface->cLevels; i++, pMipmapLevel++)
             {
                 if (VMSVGA3DSURFACE_HAS_HW_SURFACE(pSurface))
@@ -498 +497 @@
                             AssertMsgFailed(("%#x\n", fSwitchFlags));
                     }
+#elif defined(VMSVGA3D_DX)
+                    /** @todo */
+                    RT_NOREF(pState);
 #else
 # error "misconfigured"
@@ -1522 +1524 @@
 # ifdef VMSVGA3D_DIRECT3D
     pHlp->pfnPrintf(pHlp, "pDevice:                 %p\n", pContext->pDevice);
+# elif defined(VMSVGA3D_DX)
+    /** @todo */
 # else
     pHlp->pfnPrintf(pHlp, "hdc:                     %p\n", pContext->hdc);
@@ -1919 +1923 @@
     const uint32_t u32Seq = ASMAtomicIncU32(&sSeq);
 
-    for (uint32_t i = 0; i < pSurface->faces[0].numMipLevels; ++i)
+    for (uint32_t i = 0; i < pSurface->cLevels; ++i)
     {
         if (!pSurface->paMipmapLevels[i].pSurfaceData)
@@ -1978 +1982 @@
     vmsvga3dInfoU32Flags(pHlp, pSurface->surfaceFlags, "SVGA3D_SURFACE_", g_aSvga3DSurfaceFlags, RT_ELEMENTS(g_aSvga3DSurfaceFlags));
     pHlp->pfnPrintf(pHlp, "\n");
-    if (pSurface->cFaces == 0)
+    if (pSurface->cFaces != 0)
         pHlp->pfnPrintf(pHlp, "Faces:                   %u\n", pSurface->cFaces);
+    if (pSurface->cLevels != 0)
+        pHlp->pfnPrintf(pHlp, "Mipmap levels:  %u\n", pSurface->cLevels);
     for (uint32_t iFace = 0; iFace < pSurface->cFaces; iFace++)
     {
-        Assert(pSurface->faces[iFace].numMipLevels <= pSurface->faces[0].numMipLevels);
-        if (pSurface->faces[iFace].numMipLevels == 0)
-            pHlp->pfnPrintf(pHlp, "Faces[%u] Mipmap levels:  %u\n", iFace, pSurface->faces[iFace].numMipLevels);
-
-        uint32_t iMipmap = iFace * pSurface->faces[0].numMipLevels;
-        for (uint32_t iLevel = 0; iLevel < pSurface->faces[iFace].numMipLevels; iLevel++, iMipmap++)
+        uint32_t iMipmap = iFace * pSurface->cLevels;
+        for (uint32_t iLevel = 0; iLevel < pSurface->cLevels; iLevel++, iMipmap++)
         {
             pHlp->pfnPrintf(pHlp, "Face #%u, mipmap #%u[%u]:%s  cx=%u, cy=%u, cz=%u, cbSurface=%#x, cbPitch=%#x",
@@ -2030 +2032 @@
     pHlp->pfnPrintf(pHlp, "fStencilAsTexture:       %RTbool\n", pSurface->fStencilAsTexture);
 
+#elif defined(VMSVGA3D_DX)
+    /** @todo */
 #elif defined(VMSVGA3D_OPENGL)
     /** @todo   */
@@ -2039 +2043 @@
         for (uint32_t iFace = 0; iFace < pSurface->cFaces; iFace++)
         {
-            uint32_t iMipmap = iFace * pSurface->faces[0].numMipLevels;
-            for (uint32_t iLevel = 0; iLevel < pSurface->faces[iFace].numMipLevels; iLevel++, iMipmap++)
+            uint32_t iMipmap = iFace * pSurface->cLevels;
+            for (uint32_t iLevel = 0; iLevel < pSurface->cLevels; iLevel++, iMipmap++)
                 if (pSurface->paMipmapLevels[iMipmap].pSurfaceData)
                 {