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

Timestamp:

May 12, 2022 12:07:56 PM (3 years ago)

Author:

vboxsync

Message:

WDDM: D3D10DDI_QUERY_EVENT; SetPredication. bugref:9845

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• common/wddm/VBoxMPIf.h (modified) (1 diff)
• mp/wddm/gallium/VBoxMPDX.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -86 +86 @@
     VBOXDXALLOCATIONTYPE_SURFACE = 1,
     VBOXDXALLOCATIONTYPE_SHADERS = 2,
+    VBOXDXALLOCATIONTYPE_CO      = 3,
     VBOXDXALLOCATIONTYPE_MAX,
     VBOXDXALLOCATIONTYPE_32BIT = 0xFFFFFFFF

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

@@ -349 +349 @@
     if (pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_SURFACE)
         Status = svgaCreateAllocationSurface(pDevExt, pAllocation, pAllocationInfo);
-    else if (pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS)
+    else if (   pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS
+             || pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_CO)
         Status = svgaCreateAllocationShaders(pAllocation, pAllocationInfo);
     else
@@ -373 +374 @@
     if (pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_SURFACE)
         Status = svgaDestroyAllocationSurface(pDevExt->pGa->hw.pSvga, pAllocation);
-    else if (pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS)
+    else if (   pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS
+             || pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_CO)
         Status = svgaDestroyAllocationShaders(pDevExt->pGa->hw.pSvga, pAllocation);
     else
@@ -462 +464 @@
                 }
             }
-            else if (enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS)
+            else if (   enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS
+                     || enmAllocationType == VBOXDXALLOCATIONTYPE_CO)
             {
                 if (pAllocation->dx.mobid != SVGA3D_INVALID_ID)
@@ -474 +477 @@
         {
             if (   enmAllocationType == VBOXDXALLOCATIONTYPE_SURFACE
-                || enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS)
+                || enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS
+                || enmAllocationType == VBOXDXALLOCATIONTYPE_CO)
             {
                 *(uint32_t *)pPatchAddress = SVGA3D_INVALID_ID;
@@ -721 +725 @@
     AssertReturnStmt(NT_SUCCESS(Status), SvgaMobFree(pSvga, pMob), Status);
 
-    pAllocation->dx.mobid = VMSVGAMOB_ID(pMob);
-
     uint32_t cbRequired = sizeof(SVGA3dCmdHeader) + sizeof(SVGA3dCmdDefineGBMob64);
     if (pAllocation->dx.desc.enmAllocationType == VBOXDXALLOCATIONTYPE_SURFACE)
@@ -740 +742 @@
     RTAvlU32Insert(&pSvga->MobTree, &pMob->core);
     ExReleaseFastMutex(&pSvga->SvgaMutex);
+
+    pAllocation->dx.mobid = VMSVGAMOB_ID(pMob);
 
     uint8_t *pu8Cmd = (uint8_t *)pBuildPagingBuffer->pDmaBuffer;
@@ -820 +824 @@
     if (pBuildPagingBuffer->DmaSize < cbRequired)
     {
-        SvgaMobFree(pSvga, pMob);
         return STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;
     }
@@ -850 +853 @@
     {
     SVGA3dCmdDestroyGBMob *pCmd = (SVGA3dCmdDestroyGBMob *)pu8Cmd;
-    pCmd->mobid = VMSVGAMOB_ID(pMob);
+    pCmd->mobid = pAllocation->dx.mobid;
     pu8Cmd += sizeof(*pCmd);
     }
@@ -962 +965 @@
                 *(uint32_t *)pPatchAddress = pAllocation->dx.sid;
             }
-            else if (enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS)
+            else if (   enmAllocationType == VBOXDXALLOCATIONTYPE_SHADERS
+                     || enmAllocationType == VBOXDXALLOCATIONTYPE_CO)
             {
                 Assert(pAllocation->dx.mobid != SVGA3D_INVALID_ID);