Changeset 41475 in vbox

Timestamp:

May 29, 2012 10:14:42 AM (13 years ago)

Author:

vboxsync

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

78225

Message:

wddm/3d: burn fixes + logging enhancements

Location:

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

Files:

• VBoxDispD3D.cpp (modified) (1 diff)
• VBoxDispDbg.cpp (modified) (4 diffs)
• VBoxDispDbg.h (modified) (5 diffs)

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

@@ -1085 +1085 @@
         if (!pDevice->aSamplerTextures[i]) continue;
         vboxWddmDalCheckAddRc(pDevice, pDevice->aSamplerTextures[i], FALSE);
-        ++iSampler; \
-    } \
-
+        ++iSampler;
+    }
 }
 

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

@@ -50 +50 @@
 #include <iprt/assert.h>
 
+static void vboxDispLogDbgFormatStringV(char * szBuffer, uint32_t cbBuffer, const char * szString, va_list pArgList)
+{
+    uint32_t cbWritten = sprintf(szBuffer, "[0x%x.0x%x] Disp: ", GetCurrentProcessId(), GetCurrentThreadId());
+    if (cbWritten > cbBuffer)
+    {
+        AssertReleaseFailed();
+        return;
+    }
+
+    _vsnprintf(szBuffer + cbWritten, cbBuffer - cbWritten, szString, pArgList);
+}
+
 #ifdef VBOXWDDMDISP_DEBUG
 #define VBOXWDDMDISP_DEBUG_DUMP_DEFAULT 0
@@ -94 +106 @@
 DWORD g_VBoxVDbgCfgCreateSwapchainOnDdiOnce = 0;
 
-static void vboxDispLogDbgFormatStringV(char * szBuffer, uint32_t cbBuffer, const char * szString, va_list pArgList)
-{
-    uint32_t cbWritten = sprintf(szBuffer, "[0x%x.0x%x] Disp: ", GetCurrentProcessId(), GetCurrentThreadId());
-    if (cbWritten > cbBuffer)
-    {
-        AssertReleaseFailed();
-        return;
-    }
-
-    _vsnprintf(szBuffer + cbWritten, cbBuffer - cbWritten, szString, pArgList);
-}
-
 void vboxDispLogDbgPrintF(char * szString, ...)
 {
@@ -174 +174 @@
     DWORD fFlags = pInfo->fFlags;
 
-    if (!VBOXVDBG_DUMP_TYPE_ENABLED(fFlags))
+    if (!VBOXVDBG_DUMP_TYPE_ENABLED_FOR_INFO(pInfo, fFlags))
         return;
 
@@ -380 +380 @@
 }
 
+VOID vboxVDbgDoDumpSamplers(const char * pPrefix, PVBOXWDDMDISP_DEVICE pDevice, const char * pSuffix, DWORD fFlags)
+{
+    for (UINT i = 0, iSampler = 0; iSampler < pDevice->cSamplerTextures; ++i)
+    {
+        Assert(i < RT_ELEMENTS(pDevice->aSamplerTextures));
+        if (!pDevice->aSamplerTextures[i]) continue;
+        PVBOXWDDMDISP_RESOURCE pRc = pDevice->aSamplerTextures[i];
+        for (UINT j = 0; j < pRc->cAllocations; ++j)
+        {
+            PVBOXWDDMDISP_ALLOCATION pAlloc = &pRc->aAllocations[j];
+            vboxVDbgDoDumpRcRect(pPrefix, pAlloc, NULL, NULL, pSuffix, fFlags);
+        }
+        ++iSampler;
+    }
+}
+
 static DECLCALLBACK(void) vboxVDbgLockUnlockSurfTexContentsDumperCb(PVBOXVDBG_DUMP_INFO pInfo, BOOLEAN fBreak, void *pvDumper)
 {

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.h

@@ -209 +209 @@
 typedef struct VBOXWDDMDISP_RESOURCE *PVBOXWDDMDISP_RESOURCE;
 
-/* functions all dump finally comes to */
 #define VBOXVDBG_DUMP_TYPEF_FLOW                   0x00000001
 #define VBOXVDBG_DUMP_TYPEF_CONTENTS               0x00000002
 #define VBOXVDBG_DUMP_TYPEF_DONT_BREAK_ON_CONTENTS 0x00000004
 #define VBOXVDBG_DUMP_TYPEF_BREAK_ON_FLOW          0x00000008
+#define VBOXVDBG_DUMP_TYPEF_SHARED_ONLY            0x00000010
 
 #define VBOXVDBG_DUMP_FLAGS_IS_SETANY(_fFlags, _Value) (((_fFlags) & (_Value)) != 0)
@@ -222 +222 @@
 
 #define VBOXVDBG_DUMP_TYPE_ENABLED(_fFlags) (VBOXVDBG_DUMP_FLAGS_IS_SETANY(_fFlags, VBOXVDBG_DUMP_TYPEF_FLOW | VBOXVDBG_DUMP_TYPEF_CONTENTS))
+#define VBOXVDBG_DUMP_TYPE_ENABLED_FOR_INFO(_pInfo, _fFlags) ( \
+        VBOXVDBG_DUMP_TYPE_ENABLED(_fFlags) \
+        && ( \
+                   !(_pInfo)->pAlloc \
+                || (_pInfo)->pAlloc->pRc->aAllocations[0].hSharedHandle \
+                || VBOXVDBG_DUMP_FLAGS_IS_CLEARED(_fFlags, VBOXVDBG_DUMP_TYPEF_SHARED_ONLY) \
+            ))
+
 #define VBOXVDBG_DUMP_TYPE_FLOW_ONLY(_fFlags) (VBOXVDBG_DUMP_FLAGS_IS_SET(_fFlags, VBOXVDBG_DUMP_TYPEF_FLOW) \
         && VBOXVDBG_DUMP_FLAGS_IS_CLEARED(_fFlags, VBOXVDBG_DUMP_TYPEF_CONTENTS))
@@ -234 +242 @@
 VOID vboxVDbgDoDumpRcRect(const char * pPrefix, PVBOXWDDMDISP_ALLOCATION pAlloc, IDirect3DResource9 *pD3DRc, RECT *pRect, const char * pSuffix, DWORD fFlags);
 VOID vboxVDbgDoDumpLockUnlockSurfTex(const char * pPrefix, const PVBOXWDDMDISP_ALLOCATION pAlloc, const char * pSuffix, DWORD fFlags);
-/* */
-
 VOID vboxVDbgDoDumpRt(const char * pPrefix, struct VBOXWDDMDISP_DEVICE *pDevice, const char * pSuffix, DWORD fFlags);
 VOID vboxVDbgDoDumpBb(const char * pPrefix, IDirect3DSwapChain9 *pSwapchainIf, const char * pSuffix, DWORD fFlags);
 VOID vboxVDbgDoDumpFb(const char * pPrefix, IDirect3DSwapChain9 *pSwapchainIf, const char * pSuffix, DWORD fFlags);
+VOID vboxVDbgDoDumpSamplers(const char * pPrefix, struct VBOXWDDMDISP_DEVICE *pDevice, const char * pSuffix, DWORD fFlags);
 
 void vboxVDbgDoPrintRect(const char * pPrefix, const RECT *pRect, const char * pSuffix);
@@ -376 +383 @@
         { \
             vboxVDbgDoDumpRt("==>"__FUNCTION__": Rt: ", (_pDevice), "", VBOXVDBG_DUMP_FLAGS_FOR_TYPE(Flush) | VBOXVDBG_DUMP_FLAGS_FOR_TYPE(DrawPrim)); \
+            vboxVDbgDoDumpSamplers("==>"__FUNCTION__": Sl: ", (_pDevice), "", VBOXVDBG_DUMP_FLAGS_FOR_TYPE(Flush) | VBOXVDBG_DUMP_FLAGS_FOR_TYPE(DrawPrim)); \
         }\
     } while (0)
@@ -387 +395 @@
             vboxVDbgDoDumpRt("<=="__FUNCTION__": Rt: ", (_pDevice), "", \
                 VBOXVDBG_DUMP_FLAGS_FOR_TYPE(DrawPrim) | VBOXVDBG_DUMP_FLAGS_FOR_TYPE(Shared)); \
+            vboxVDbgDoDumpSamplers("<=="__FUNCTION__": Sl: ", (_pDevice), "", VBOXVDBG_DUMP_FLAGS_FOR_TYPE(Flush) | VBOXVDBG_DUMP_FLAGS_FOR_TYPE(DrawPrim)); \
         }\
     } while (0)