Changeset 51328 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm

Timestamp:

May 21, 2014 5:26:31 PM (11 years ago)

Author:

vboxsync

Message:

wddm: disable complex topologies for now

Location:

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

Files:

• VBoxMPVidPn.cpp (modified) (5 diffs)
• VBoxMPWddm.cpp (modified) (2 diffs)

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

@@ -1406 +1406 @@
     const DXGK_VIDPNTARGETMODESET_INTERFACE *pNewVidPnTargetModeSetInterface;
 
-    Assert(pDevExt->fCmdVbvaEnabled || VidPnSourceId == VidPnTargetId);
+    Assert(pDevExt->fComplexTopologiesEnabled || VidPnSourceId == VidPnTargetId);
 
     D3DKMDT_HVIDPNSOURCEMODESET hCurVidPnSourceModeSet;
@@ -1446 +1446 @@
         {
             Assert(hNewVidPnTargetModeSet);
-            Assert(pDevExt->fCmdVbvaEnabled || VidPnSourceId == VidPnTargetId);
+            Assert(pDevExt->fComplexTopologiesEnabled || VidPnSourceId == VidPnTargetId);
 //            if (VidPnSourceId == VidPnTargetId && pCbContext->apPathInfos[VidPnTargetId].enmState == VBOXVIDPNPATHITEM_STATE_PRESENT)
             {
@@ -1537 +1537 @@
     const DXGK_VIDPNSOURCEMODESET_INTERFACE *pNewVidPnSourceModeSetInterface;
 
-    Assert(pDevExt->fCmdVbvaEnabled || VidPnSourceId == VidPnTargetId);
+    Assert(pDevExt->fComplexTopologiesEnabled || VidPnSourceId == VidPnTargetId);
 
     D3DKMDT_HVIDPNTARGETMODESET hCurVidPnTargetModeSet;
@@ -1577 +1577 @@
         {
             Assert(hNewVidPnSourceModeSet);
-            Assert(pDevExt->fCmdVbvaEnabled || VidPnSourceId == VidPnTargetId);
+            Assert(pDevExt->fComplexTopologiesEnabled || VidPnSourceId == VidPnTargetId);
 //            if (VidPnSourceId == VidPnTargetId && pCbContext->apPathInfos[VidPnSourceId].enmState == VBOXVIDPNPATHITEM_STATE_PRESENT)
             {
@@ -1743 +1743 @@
 static BOOLEAN vboxVidPnIsPathSupported(PVBOXMP_DEVEXT pDevExt, const D3DKMDT_VIDPN_PRESENT_PATH *pNewVidPnPresentPathInfo)
 {
-    if (!pDevExt->fCmdVbvaEnabled && pNewVidPnPresentPathInfo->VidPnSourceId != pNewVidPnPresentPathInfo->VidPnTargetId)
+    if (!pDevExt->fComplexTopologiesEnabled && pNewVidPnPresentPathInfo->VidPnSourceId != pNewVidPnPresentPathInfo->VidPnTargetId)
     {
         LOG(("unsupported source(%d)->target(%d) pair", pNewVidPnPresentPathInfo->VidPnSourceId, pNewVidPnPresentPathInfo->VidPnTargetId));

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

@@ -1094 +1094 @@
                     pDevExt->fTexPresentEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_TEX_PRESENT);
                     pDevExt->fCmdVbvaEnabled = !!(VBoxMpCrGetHostCaps() & CR_VBOX_CAP_CMDVBVA);
+# if 0
+                    pDevExt->fComplexTopologiesEnabled = pDevExt->fCmdVbvaEnabled;
+# else
+                    pDevExt->fComplexTopologiesEnabled = FALSE;
+# endif
                 }
                 else
@@ -1099 +1104 @@
                     pDevExt->fTexPresentEnabled = FALSE;
                     pDevExt->fCmdVbvaEnabled = FALSE;
+                    pDevExt->fComplexTopologiesEnabled = FALSE;
                 }
 #endif