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

Timestamp:

Dec 13, 2023 5:43:40 PM (15 months ago)

Author:

vboxsync

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

160742

Message:

WDDM: removed wrong SetError

Location:

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

Files:

• VBoxDX.cpp (modified) (2 diffs)
• VBoxDX.h (modified) (1 diff)
• VBoxDXDDI.cpp (modified) (4 diffs)

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

@@ -2039 +2039 @@
 void vboxDXQueryGetData(PVBOXDX_DEVICE pDevice, PVBOXDXQUERY pQuery, VOID* pData, UINT DataSize, UINT Flags)
 {
-    Assert(pQuery->enmQueryState == VBOXDXQUERYSTATE_ISSUED);
+    Assert(pQuery->enmQueryState == VBOXDXQUERYSTATE_ISSUED || pQuery->enmQueryState == VBOXDXQUERYSTATE_SIGNALED);
 
     if (!RT_BOOL(Flags & D3D10_DDI_GET_DATA_DO_NOT_FLUSH))
@@ -2072 +2072 @@
             if (pData && DataSize >= sizeof(BOOL))
                 *(BOOL *)pData = TRUE;
-
-            vboxDXDeviceSetError(pDevice, S_OK);
         }
         return;

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

@@ -818 +818 @@
 DECLINLINE(void) vboxDXDeviceSetError(PVBOXDX_DEVICE pDevice, HRESULT hr)
 {
-    Assert(SUCCEEDED(hr) || hr == DXGI_DDI_ERR_WASSTILLDRAWING);
-    /* This callback is also used for setting S_OK, etc results, so always call it. */
+    Assert(hr == DXGI_DDI_ERR_WASSTILLDRAWING);
     pDevice->pUMCallbacks->pfnSetErrorCb(pDevice->hRTCoreLayer, hr);
 }

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

@@ -1188 +1188 @@
 )
 {
-    //DEBUG_BREAKPOINT_TEST();
+    /* This is usually a sign of trouble. Break into debugger. */
+    DEBUG_BREAKPOINT_TEST();
     RT_NOREF(hDevice, pDeviceFunctions);
     LogFlowFunc(("pDeviceFunctions %p", pDeviceFunctions));
@@ -1199 +1200 @@
 )
 {
-    //DEBUG_BREAKPOINT_TEST();
+    DEBUG_BREAKPOINT_TEST();
     RT_NOREF(hDevice, pDeviceFunctions);
     LogFlowFunc(("pDeviceFunctions %p", pDeviceFunctions));
@@ -1210 +1211 @@
 )
 {
-    //DEBUG_BREAKPOINT_TEST();
+    DEBUG_BREAKPOINT_TEST();
     RT_NOREF(hDevice, pDeviceFunctions);
     LogFlowFunc(("pDeviceFunctions %p", pDeviceFunctions));
@@ -1221 +1222 @@
 )
 {
-    //DEBUG_BREAKPOINT_TEST();
+    DEBUG_BREAKPOINT_TEST();
     RT_NOREF(hDevice, pDeviceFunctions);
     LogFlowFunc(("pDeviceFunctions %p", pDeviceFunctions));