Changeset 83840 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Apr 20, 2020 9:16:29 AM (5 years ago)

Author:

vboxsync

Message:

VBoxMPWddm.h: Removed ancient disabling of assertions (r71411).

Location:

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

Files:

• VBoxMPLegacy.cpp (modified) (2 diffs)
• VBoxMPWddm.cpp (modified) (3 diffs)
• VBoxMPWddm.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPLegacy.cpp

@@ -1000 +1000 @@
     {
         Assert(pPresent->Flags.Value == 4); /* only Blt is set, we do not support anything else for now */
-        Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D);
+        //Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_3D);
         DXGK_ALLOCATIONLIST *pSrc =  &pPresent->pAllocationList[DXGK_PRESENT_SOURCE_INDEX];
         PVBOXWDDM_ALLOCATION pSrcAlloc = vboxWddmGetAllocationFromAllocList(pSrc);
@@ -1030 +1030 @@
     else if (pPresent->Flags.ColorFill)
     {
-        Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D);
+        //Assert(pContext->enmType == VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D);
         Assert(pPresent->Flags.Value == 2); /* only ColorFill is set, we do not support anything else for now */
         DXGK_ALLOCATIONLIST *pDst =  &pPresent->pAllocationList[DXGK_PRESENT_DESTINATION_INDEX];

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -503 +503 @@
     {
         VBOXWDDM_TARGET *pTarget = &pDevExt->aTargets[i];
-        Assert(pTarget->u32Id == i);
+        Assert(pTarget->u32Id == (unsigned)i);
         if (pTarget->VidPnSourceId != D3DDDI_ID_UNINITIALIZED)
         {
@@ -562 +562 @@
     {
         VBOXWDDM_TARGET *pTarget = &pDevExt->aTargets[i];
-        Assert(pTarget->u32Id == i);
+        Assert(pTarget->u32Id == (unsigned)i);
         if (pTarget->VidPnSourceId != D3DDDI_ID_UNINITIALIZED)
         {
@@ -3850 +3850 @@
             {
                 VBOXWDDM_TARGET *pTarget = &pDevExt->aTargets[i];
-                Assert(pTarget->u32Id == i);
+                Assert(pTarget->u32Id == (unsigned)i);
                 if (pTarget->VidPnSourceId != D3DDDI_ID_UNINITIALIZED)
                 {

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.h

@@ -24 +24 @@
 #define VBOX_WDDM_DRIVERNAME L"VBoxWddm"
 
-#ifndef DEBUG_misha
-# ifdef Assert
-#  error "VBoxMPWddm.h must be included first."
-# endif
-# define RT_NO_STRICT
-#endif
 #include "common/VBoxMPUtils.h"
 #include "common/VBoxMPDevExt.h"