Changeset 41471 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

Timestamp:

May 29, 2012 7:12:09 AM (13 years ago)

Author:

vboxsync

Message:

wddm/3d: more correct shared rc usage reporting

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp (modified) (12 diffs)

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

@@ -1059 +1059 @@
 }
 
-static VOID vboxWddmDalCheckAddRts(PVBOXWDDMDISP_DEVICE pDevice)
+static DECLINLINE(BOOLEAN) vboxWddmDalCheckAddRc(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_RESOURCE pRc, BOOLEAN fWrite)
+{
+    BOOLEAN fChanged = FALSE;
+    for (UINT i = 0; i < pRc->cAllocations; ++i)
+    {
+        PVBOXWDDMDISP_ALLOCATION pDAlloc = &pRc->aAllocations[i];
+        fChanged |= vboxWddmDalCheckAdd(pDevice, pDAlloc, fWrite);
+    }
+    return fChanged;
+}
+
+static VOID vboxWddmDalCheckAddRtsSamplers(PVBOXWDDMDISP_DEVICE pDevice)
 {
     for (UINT i = 0; i < pDevice->cRTs; ++i)
@@ -1068 +1079 @@
         }
     }
+
+    for (UINT i = 0, iSampler = 0; iSampler < pDevice->cSamplerTextures; ++i)
+    {
+        Assert(i < RT_ELEMENTS(pDevice->aSamplerTextures));
+        if (!pDevice->aSamplerTextures[i]) continue;
+        vboxWddmDalCheckAddRc(pDevice, pDevice->aSamplerTextures[i], FALSE);
+        ++iSampler; \
+    } \
+
 }
 
@@ -3527 +3547 @@
         }
 
-#ifdef VBOXWDDMDISP_DEBUG
         Assert(pDevice->cSamplerTextures < RT_ELEMENTS(pDevice->aSamplerTextures));
         int idx = VBOXWDDMDISP_SAMPLER_IDX(Stage);
@@ -3550 +3569 @@
             WARN(("incorrect dampler index1! (%d)\n", Stage));
         }
-#endif
     }
     else
     {
         pD3DIfTex = NULL;
-#ifdef VBOXWDDMDISP_DEBUG
         Assert(pDevice->cSamplerTextures < RT_ELEMENTS(pDevice->aSamplerTextures));
         int idx = VBOXWDDMDISP_SAMPLER_IDX(Stage);
@@ -3573 +3590 @@
             WARN(("incorrect dampler index2! (%d)\n", Stage));
         }
-#endif
     }
 
@@ -3753 +3769 @@
     }
 
-    vboxWddmDalCheckAddRts(pDevice);
+    vboxWddmDalCheckAddRtsSamplers(pDevice);
 
     VBOXVDBG_DUMP_DRAWPRIM_LEAVE(pDevice);
@@ -3807 +3823 @@
     Assert(hr == S_OK);
 
-    vboxWddmDalCheckAddRts(pDevice);
+    vboxWddmDalCheckAddRtsSamplers(pDevice);
 
     VBOXVDBG_DUMP_DRAWPRIM_LEAVE(pDevice);
@@ -3823 +3839 @@
     VBOXDISPCRHGSMI_SCOPE_SET_DEV(pDevice);
     Assert(0);
-    vboxWddmDalCheckAddRts(pDevice);
+    vboxWddmDalCheckAddRtsSamplers(pDevice);
     vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
     return E_FAIL;
@@ -3836 +3852 @@
     VBOXDISPCRHGSMI_SCOPE_SET_DEV(pDevice);
     Assert(0);
-    vboxWddmDalCheckAddRts(pDevice);
+    vboxWddmDalCheckAddRtsSamplers(pDevice);
     vboxVDbgPrintF(("==> "__FUNCTION__", hDevice(0x%p)\n", hDevice));
     return E_FAIL;
@@ -3929 +3945 @@
 #endif
 
-    vboxWddmDalCheckAddRts(pDevice);
+    vboxWddmDalCheckAddRtsSamplers(pDevice);
 
     VBOXVDBG_DUMP_DRAWPRIM_LEAVE(pDevice);
@@ -3946 +3962 @@
     VBOXDISPCRHGSMI_SCOPE_SET_DEV(pDevice);
     Assert(0);
-    vboxWddmDalCheckAddRts(pDevice);
+    vboxWddmDalCheckAddRtsSamplers(pDevice);
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p)\n", hDevice));
     return E_FAIL;
@@ -4049 +4065 @@
     }
 
-    for (UINT i = 0; i < pDstRc->cAllocations; ++i)
-    {
-        PVBOXWDDMDISP_ALLOCATION pDAlloc = &pDstRc->aAllocations[i];
-        vboxWddmDalCheckAdd(pDevice, pDAlloc, TRUE);
-    }
-
-    for (UINT i = 0; i < pSrcRc->cAllocations; ++i)
-    {
-        PVBOXWDDMDISP_ALLOCATION pDAlloc = &pSrcRc->aAllocations[i];
-        vboxWddmDalCheckAdd(pDevice, pDAlloc, FALSE);
-    }
+    vboxWddmDalCheckAddRc(pDevice, pDstRc, TRUE);
+    vboxWddmDalCheckAddRc(pDevice, pSrcRc, FALSE);
 
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p), hr(0x%x)\n", hDevice, hr));