Changeset 36046 in vbox

Timestamp:

Feb 21, 2011 5:19:32 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: debugging

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispCm.cpp (modified) (1 diff)
• Display/wddm/VBoxDispD3D.cpp (modified) (1 diff)
• Display/wddm/VBoxDispDbg.cpp (modified) (3 diffs)
• Display/wddm/VBoxDispDbg.h (modified) (3 diffs)
• Miniport/wddm/VBoxVideoVdma.cpp (modified) (1 diff)
• Miniport/wddm/VBoxVideoWddm.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispCm.cpp

@@ -38 +38 @@
 HRESULT vboxDispCmSessionTerm(PVBOXDISPCM_SESSION pSession)
 {
+#ifdef DEBUG_misha
     Assert(RTListIsEmpty(&pSession->CtxList));
+#endif
     BOOL bRc = CloseHandle(pSession->hEvent);
     Assert(bRc);

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

@@ -1635 +1635 @@
         DdiEscape.PrivateDriverDataSize = RT_OFFSETOF(VBOXDISPIFESCAPE_SWAPCHAININFO, SwapchainInfo.ahAllocs[Buf.SwapchainInfo.SwapchainInfo.cAllocs]);
         HRESULT hr = pDevice->RtCallbacks.pfnEscapeCb(pDevice->pAdapter->hAdapter, &DdiEscape);
+#ifdef DEBUG_misha
         Assert(hr == S_OK);
+#endif
         if (hr == S_OK)
         {

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispDbg.cpp

@@ -67 +67 @@
 PVBOXDISPDBG vboxDispDbgGet()
 {
-    if (ASMAtomicCmpXchgU32((volatile uint32_t *)g_VBoxDispDbg.enmState, VBOXDISPDBG_STATE_UNINITIALIZED, VBOXDISPDBG_STATE_INITIALIZING))
+    if (ASMAtomicCmpXchgU32((volatile uint32_t *)&g_VBoxDispDbg.enmState, VBOXDISPDBG_STATE_INITIALIZING, VBOXDISPDBG_STATE_UNINITIALIZED))
     {
         HRESULT hr = vboxDispKmtCallbacksInit(&g_VBoxDispDbg.KmtCallbacks);
@@ -73 +73 @@
         if (hr == S_OK)
         {
-            ASMAtomicWriteU32((volatile uint32_t *)g_VBoxDispDbg.enmState, VBOXDISPDBG_STATE_INITIALIZED);
+            ASMAtomicWriteU32((volatile uint32_t *)&g_VBoxDispDbg.enmState, VBOXDISPDBG_STATE_INITIALIZED);
             return &g_VBoxDispDbg;
         }
         else
         {
-            ASMAtomicWriteU32((volatile uint32_t *)g_VBoxDispDbg.enmState, VBOXDISPDBG_STATE_UNINITIALIZED);
-        }
-    }
-    else if (ASMAtomicReadU32((volatile uint32_t *)g_VBoxDispDbg.enmState) == VBOXDISPDBG_STATE_INITIALIZED)
+            ASMAtomicWriteU32((volatile uint32_t *)&g_VBoxDispDbg.enmState, VBOXDISPDBG_STATE_UNINITIALIZED);
+        }
+    }
+    else if (ASMAtomicReadU32((volatile uint32_t *)&g_VBoxDispDbg.enmState) == VBOXDISPDBG_STATE_INITIALIZED)
     {
         return &g_VBoxDispDbg;
@@ -141 +141 @@
     vboxDispLogDrv(szBuffer);
 }
+
+void vboxDispLogDbgPrintF(char * szString, ...)
+{
+    char szBuffer[4096] = {0};
+    va_list pArgList;
+    va_start(pArgList, szString);
+    _vsnprintf(szBuffer, sizeof(szBuffer) / sizeof(szBuffer[0]), szString, pArgList);
+    va_end(pArgList);
+
+    OutputDebugStringA(szBuffer);
+}
+
 
 VOID vboxVDbgDoDumpSurfRectByAlloc(const char * pPrefix, PVBOXWDDMDISP_ALLOCATION pAlloc, const RECT *pRect, const char* pSuffix)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispDbg.h

@@ -25 +25 @@
  * the workaround so far is to pass the log info to the kernel driver and DbgPrint'ed from there,
  * which is enabled by this define */
-//#  define VBOXWDDMDISP_DEBUG_PRINTDRV
+#  define VBOXWDDMDISP_DEBUG_PRINTDRV
+/* use OutputDebugString */
+#  define VBOXWDDMDISP_DEBUG_PRINT
 /* adds vectored exception handler to be able to catch non-debug UM exceptions in kernel debugger */
 #  define VBOXWDDMDISP_DEBUG_VEHANDLER
@@ -60 +62 @@
 # define DbgPrintDrvFlow(_m) do { } while (0)
 #endif
+
+#ifdef VBOXWDDMDISP_DEBUG_PRINT
+# define DbgPrintUsr(_m) do { vboxDispLogDbgPrintF _m; } while (0)
+# define DbgPrintUsrRel(_m) do { vboxDispLogDbgPrintF _m; } while (0)
+# define DbgPrintUsrFlow(_m) do { } while (0)
+#else
+# define DbgPrintUsr(_m) do { } while (0)
+# define DbgPrintUsrRel(_m) do { } while (0)
+# define DbgPrintUsrFlow(_m) do { } while (0)
+#endif
 #define vboxVDbgPrint(_m) do { \
         Log(_m); \
+        DbgPrintUsr(_m); \
         DbgPrintDrv(_m); \
     } while (0)
 #define vboxVDbgPrintF(_m)  do { \
         LogFlow(_m); \
+        DbgPrintUsrFlow(_m); \
         DbgPrintDrvFlow(_m); \
     } while (0)
 #define vboxVDbgPrintR(_m)  do { \
         LogRel(_m); \
+        DbgPrintUsrRel(_m); \
         DbgPrintDrvRel(_m); \
     } while (0)
@@ -81 +96 @@
 void vboxDispLogDrvF(char * szString, ...);
 void vboxDispLogDrv(char * szString);
+void vboxDispLogDbgPrintF(char * szString, ...);
 
 typedef struct VBOXWDDMDISP_ALLOCATION *PVBOXWDDMDISP_ALLOCATION;

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.cpp

@@ -1540 +1540 @@
 {
     PVBOXVDMADDI_CMD_COMPLETED_CB pdc = (PVBOXVDMADDI_CMD_COMPLETED_CB)Context;
-    BOOLEAN bNeedDps = vboxVdmaDdiCmdCompletedIrq(pdc->pDevExt, pdc->pQueue, pdc->pCmd, pdc->enmComplType);
-    pdc->pDevExt->bNotifyDxDpc |= bNeedDps;
-
-    return bNeedDps;
+    BOOLEAN bNeedDpc = vboxVdmaDdiCmdCompletedIrq(pdc->pDevExt, pdc->pQueue, pdc->pCmd, pdc->enmComplType);
+    pdc->pDevExt->bNotifyDxDpc |= bNeedDpc;
+
+    return bNeedDpc;
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -2422 +2422 @@
                     VBOXVDMAPIPE_FLAGS_DMACMD fBltFlags;
                     fBltFlags.Value = 0;
-                    if (!vboxVhwaHlpOverlayListIsEmpty(pDevExt, pDstAlloc->SurfDesc.VidPnSourceId))
+                    if (pDstAlloc->SurfDesc.VidPnSourceId != D3DDDI_ID_UNINITIALIZED &&
+                            !vboxVhwaHlpOverlayListIsEmpty(pDevExt, pDstAlloc->SurfDesc.VidPnSourceId))
                     {
                         fBltFlags.b2DRelated = 1;