Changeset 95010 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

May 13, 2022 4:50:32 PM (3 years ago)

Author:

vboxsync

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

151439

Message:

WDDM: 64 bit surfaceFlags. bugref:9845

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium

Files:

• SvgaRender.cpp (modified) (8 diffs)
• VBoxMPDX.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/SvgaRender.cpp

@@ -393 +393 @@
 
 
-/* SVGA_3D_CMD_DEFINE_GB_SURFACE 1097 */
-static NTSTATUS procCmdDefineGBSurface(PVBOXWDDM_EXT_VMSVGA pSvga, PVMSVGACONTEXT pSvgaContext, SVGA3dCmdHeader *pHeader)
-{
-    SVGA3dCmdDefineGBSurface *pCmd = (SVGA3dCmdDefineGBSurface *)&pHeader[1];
-    RT_NOREF(pSvga, pSvgaContext, pCmd);
-    return STATUS_SUCCESS;
-}
-
-
 /* SVGA_3D_CMD_DESTROY_GB_SURFACE 1098 */
 static NTSTATUS procCmdDestroyGBSurface(PVBOXWDDM_EXT_VMSVGA pSvga, PVMSVGACONTEXT pSvgaContext, SVGA3dCmdHeader *pHeader)
@@ -681 +672 @@
 
 
-/* SVGA_3D_CMD_DEFINE_GB_SURFACE_V2 1134 */
-static NTSTATUS procCmdDefineGBSurface_v2(PVBOXWDDM_EXT_VMSVGA pSvga, PVMSVGACONTEXT pSvgaContext, SVGA3dCmdHeader *pHeader)
-{
-    SVGA3dCmdDefineGBSurface_v2 *pCmd = (SVGA3dCmdDefineGBSurface_v2 *)&pHeader[1];
-    RT_NOREF(pSvga, pSvgaContext, pCmd);
-    return STATUS_SUCCESS;
-}
-
-
 /* SVGA_3D_CMD_DEFINE_GB_MOB64 1135 */
 static NTSTATUS procCmdDefineGBMob64(PVBOXWDDM_EXT_VMSVGA pSvga, PVMSVGACONTEXT pSvgaContext, SVGA3dCmdHeader *pHeader)
@@ -1548 +1530 @@
 
 
-/* SVGA_3D_CMD_DEFINE_GB_SURFACE_V3 1239 */
-static NTSTATUS procCmdDefineGBSurface_v3(PVBOXWDDM_EXT_VMSVGA pSvga, PVMSVGACONTEXT pSvgaContext, SVGA3dCmdHeader *pHeader)
-{
-    SVGA3dCmdDefineGBSurface_v3 *pCmd = (SVGA3dCmdDefineGBSurface_v3 *)&pHeader[1];
-    RT_NOREF(pSvga, pSvgaContext, pCmd);
-    return STATUS_SUCCESS;
-}
-
-
 /* SVGA_3D_CMD_DX_RESOLVE_COPY 1240 */
 static NTSTATUS procCmdDXResolveCopy(PVBOXWDDM_EXT_VMSVGA pSvga, PVMSVGACONTEXT pSvgaContext, SVGA3dCmdHeader *pHeader)
@@ -1777 +1750 @@
 {
     SVGA3dCmdLogicOpsClearTypeBlend *pCmd = (SVGA3dCmdLogicOpsClearTypeBlend *)&pHeader[1];
-    RT_NOREF(pSvga, pSvgaContext, pCmd);
-    return STATUS_SUCCESS;
-}
-
-
-/* SVGA_3D_CMD_DEFINE_GB_SURFACE_V4 1267 */
-static NTSTATUS procCmdDefineGBSurface_v4(PVBOXWDDM_EXT_VMSVGA pSvga, PVMSVGACONTEXT pSvgaContext, SVGA3dCmdHeader *pHeader)
-{
-    SVGA3dCmdDefineGBSurface_v4 *pCmd = (SVGA3dCmdDefineGBSurface_v4 *)&pHeader[1];
     RT_NOREF(pSvga, pSvgaContext, pCmd);
     return STATUS_SUCCESS;
@@ -1943 +1907 @@
     { procCmdInvalid },                             // SVGA_3D_CMD_DEAD3
     { procCmdUpdateGBMobMapping },                  // SVGA_3D_CMD_UPDATE_GB_MOB_MAPPING
-    { procCmdDefineGBSurface },                     // SVGA_3D_CMD_DEFINE_GB_SURFACE
+    { procCmdInvalid },                             // SVGA_3D_CMD_DEFINE_GB_SURFACE
     { procCmdDestroyGBSurface },                    // SVGA_3D_CMD_DESTROY_GB_SURFACE
     { procCmdBindGBSurface },                       // SVGA_3D_CMD_BIND_GB_SURFACE
@@ -1980 +1944 @@
     { procCmdBindGBSurfaceWithPitch },              // SVGA_3D_CMD_BIND_GB_SURFACE_WITH_PITCH
     { procCmdGBMobFence },                          // SVGA_3D_CMD_GB_MOB_FENCE
-    { procCmdDefineGBSurface_v2 },                  // SVGA_3D_CMD_DEFINE_GB_SURFACE_V2
+    { procCmdInvalid },                             // SVGA_3D_CMD_DEFINE_GB_SURFACE_V2
     { procCmdDefineGBMob64 },                       // SVGA_3D_CMD_DEFINE_GB_MOB64
     { procCmdRedefineGBMob64 },                     // SVGA_3D_CMD_REDEFINE_GB_MOB64
@@ -2085 +2049 @@
     { procCmdDXGrowCOTable },                       // SVGA_3D_CMD_DX_GROW_COTABLE
     { procCmdIntraSurfaceCopy },                    // SVGA_3D_CMD_INTRA_SURFACE_COPY
-    { procCmdDefineGBSurface_v3 },                  // SVGA_3D_CMD_DEFINE_GB_SURFACE_V3
+    { procCmdInvalid },                             // SVGA_3D_CMD_DEFINE_GB_SURFACE_V3
     { procCmdDXResolveCopy },                       // SVGA_3D_CMD_DX_RESOLVE_COPY
     { procCmdDXPredResolveCopy },                   // SVGA_3D_CMD_DX_PRED_RESOLVE_COPY
@@ -2113 +2077 @@
     { procCmdInvalid },                             // SVGA_3D_CMD_RESERVED2_1
     { procCmdInvalid },                             // SVGA_3D_CMD_RESERVED2_2
-    { procCmdDefineGBSurface_v4 },                  // SVGA_3D_CMD_DEFINE_GB_SURFACE_V4
+    { procCmdInvalid },                             // SVGA_3D_CMD_DEFINE_GB_SURFACE_V4
     { procCmdDXSetCSUAViews },                      // SVGA_3D_CMD_DX_SET_CS_UA_VIEWS
     { procCmdDXSetMinLOD },                         // SVGA_3D_CMD_DX_SET_MIN_LOD

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/gallium/VBoxMPDX.cpp

@@ -43 +43 @@
     if (NT_SUCCESS(Status))
     {
-        void *pvCmd = SvgaCmdBuf3dCmdReserve(pSvga, SVGA_3D_CMD_DEFINE_GB_SURFACE_V2, sizeof(SVGA3dCmdDefineGBSurface_v2), SVGA3D_INVALID_ID);
+        void *pvCmd = SvgaCmdBuf3dCmdReserve(pSvga, SVGA_3D_CMD_DEFINE_GB_SURFACE_V4, sizeof(SVGA3dCmdDefineGBSurface_v4), SVGA3D_INVALID_ID);
         if (pvCmd)
         {
-            SVGA3dCmdDefineGBSurface_v2 *pCmd = (SVGA3dCmdDefineGBSurface_v2 *)pvCmd;
+            SVGA3dCmdDefineGBSurface_v4 *pCmd = (SVGA3dCmdDefineGBSurface_v4 *)pvCmd;
             pCmd->sid              = pAllocation->dx.sid;
-            pCmd->surfaceFlags     = (uint32_t)pAllocation->dx.desc.surfaceInfo.surfaceFlags;
+            pCmd->surfaceFlags     = pAllocation->dx.desc.surfaceInfo.surfaceFlags;
             pCmd->format           = pAllocation->dx.desc.surfaceInfo.format;
             pCmd->numMipLevels     = pAllocation->dx.desc.surfaceInfo.numMipLevels;
@@ -55 +55 @@
             pCmd->size             = pAllocation->dx.desc.surfaceInfo.size;
             pCmd->arraySize        = pAllocation->dx.desc.surfaceInfo.arraySize;
-            pCmd->pad              = 0;
-            SvgaCmdBufCommit(pSvga, sizeof(SVGA3dCmdDefineGBSurface_v2));
+            pCmd->bufferByteStride = pAllocation->dx.desc.surfaceInfo.bufferByteStride;
+            SvgaCmdBufCommit(pSvga, sizeof(SVGA3dCmdDefineGBSurface_v4));
         }
         else