Changeset 99856 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

May 19, 2023 8:54:11 AM (23 months ago)

Author:

vboxsync

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

157494

Message:

WDDM: Take into account the D3D10_DDI_MAP_FLAG_DONOTWAIT flag in vboxDXResourceMap. bugref:9845

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDX.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/dx/VBoxDX.cpp

@@ -276 +276 @@
     pPatchLocation->SplitOffset = pDevice->cbCommandBuffer;
     ++pDevice->cPatchLocations;
+}
+
+
+static bool dxIsAllocationInUse(PVBOXDX_DEVICE pDevice, D3DKMT_HANDLE hAllocation)
+{
+    if (!hAllocation)
+        return false;
+
+    /* Find the same hAllocation */
+    int idxAllocation = -1;
+    for (unsigned i = 0; i < pDevice->cAllocations; ++i)
+    {
+         D3DDDI_ALLOCATIONLIST *p = &pDevice->pAllocationList[i];
+         if (p->hAllocation == hAllocation)
+         {
+             idxAllocation = i;
+             break;
+         }
+    }
+
+    return idxAllocation >= 0;
 }
 
@@ -2399 +2420 @@
     Assert(pResource->uMap == 0); /* Must not be already mapped */
 
+    if (   RT_BOOL(Flags & D3D10_DDI_MAP_FLAG_DONOTWAIT)
+        && dxIsAllocationInUse(pDevice, vboxDXGetAllocation(pResource)))
+    {
+        vboxDXFlush(pDevice, true);
+        vboxDXDeviceSetError(pDevice, DXGI_DDI_ERR_WASSTILLDRAWING);
+        return;
+    }
+
     HRESULT hr;
     D3DDDICB_LOCK ddiLock;
@@ -2406 +2435 @@
         ddiLock.hAllocation = vboxDXGetAllocation(pResource);
         ddiLock.Flags.ReadOnly =   DDIMap == D3D10_DDI_MAP_READ;
-        ddiLock.Flags.WriteOnly =  0 /** @todo Is it? DDIMap == D3D10_DDI_MAP_WRITE */
+        ddiLock.Flags.WriteOnly =  DDIMap == D3D10_DDI_MAP_WRITE
                                 || DDIMap == D3D10_DDI_MAP_WRITE_DISCARD
                                 || DDIMap == D3D10_DDI_MAP_WRITE_NOOVERWRITE;
@@ -2417 +2446 @@
         hr = pDevice->pRTCallbacks->pfnLockCb(pDevice->hRTDevice.handle, &ddiLock);
         if (hr == D3DERR_WASSTILLDRAWING)
+        {
+            if (RT_BOOL(Flags & D3D10_DDI_MAP_FLAG_DONOTWAIT))
+            {
+                vboxDXDeviceSetError(pDevice, DXGI_DDI_ERR_WASSTILLDRAWING);
+                return;
+            }
+
             RTThreadYield();
+        }
     } while (hr == D3DERR_WASSTILLDRAWING);