Changeset 52137 in vbox

Timestamp:

Jul 22, 2014 7:59:31 PM (11 years ago)

Author:

vboxsync

Message:

wddm simplify a bit

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVidPn.cpp (modified) (4 diffs)

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

@@ -1630 +1630 @@
     const D3DKMDT_VIDPN_PRESENT_PATH * pPath;
     VBOXCMDVBVA_SCREENMAP_DECL(uint32_t, aVisitedTargetMap);
-    VBOXCMDVBVA_SCREENMAP_DECL(uint32_t, aModeMap);
-    CR_SORTARRAY aModes[VBOX_VIDEO_MAX_SCREENS];
 
     memset(aVisitedTargetMap, 0, sizeof (aVisitedTargetMap));
-    memset(aModeMap, 0, sizeof (aModeMap));
-    memset(aModes, 0, sizeof (aModes));
-
-    CR_SORTARRAY TargetMode = {0};
 
     BOOLEAN fSupported = TRUE;
@@ -1644 +1638 @@
     while ((pPath = VBoxVidPnPathIterNext(&PathIter)) != NULL)
     {
-        CrSaClear(&TargetMode);
         D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId = pPath->VidPnSourceId;
         D3DDDI_VIDEO_PRESENT_TARGET_ID VidPnTargetId = pPath->VidPnTargetId;
@@ -1681 +1674 @@
             break;
         }
-
-        {
-            D3DKMDT_HVIDPNTARGETMODESET hVidPnModeSet;
-            const DXGK_VIDPNTARGETMODESET_INTERFACE *pVidPnModeSetInterface;
-            Status = pVidPnInterface->pfnAcquireTargetModeSet(hVidPn,
-                        VidPnTargetId,
-                        &hVidPnModeSet,
-                        &pVidPnModeSetInterface);
-            if (!NT_SUCCESS(Status))
-            {
-                WARN(("pfnAcquireTargetModeSet failed %#x", Status));
-                break;
-            }
-
-            Status = vboxVidPnTargetModeSetToArray(hVidPnModeSet, pVidPnModeSetInterface, &TargetMode);
-            if (!NT_SUCCESS(Status))
-            {
-                WARN(("vboxVidPnTargetModeSetToArray failed %#x", Status));
-                break;
-            }
-
-            NTSTATUS tmpStatus = pVidPnInterface->pfnReleaseTargetModeSet(hVidPn, hVidPnModeSet);
-            Assert(tmpStatus == STATUS_SUCCESS);
-        }
-
-        if (!ASMBitTest(aModeMap, VidPnSourceId))
-        {
-            D3DKMDT_HVIDPNSOURCEMODESET hVidPnModeSet;
-            const DXGK_VIDPNSOURCEMODESET_INTERFACE *pVidPnModeSetInterface;
-            Status = pVidPnInterface->pfnAcquireSourceModeSet(hVidPn,
-                        VidPnSourceId,
-                        &hVidPnModeSet,
-                        &pVidPnModeSetInterface);
-            if (!NT_SUCCESS(Status))
-            {
-                WARN(("pfnAcquireSourceModeSet failed %#x", Status));
-                break;
-            }
-
-            Status = vboxVidPnSourceModeSetToArray(hVidPnModeSet, pVidPnModeSetInterface, &aModes[VidPnSourceId]);
-            if (!NT_SUCCESS(Status))
-            {
-                WARN(("vboxVidPnSourceModeSetToArray failed %#x", Status));
-                break;
-            }
-
-            NTSTATUS tmpStatus = pVidPnInterface->pfnReleaseSourceModeSet(hVidPn, hVidPnModeSet);
-            Assert(tmpStatus == STATUS_SUCCESS);
-
-            ASMBitSet(aModeMap, VidPnSourceId);
-        }
-
-        if (CrSaCmp(&aModes[VidPnSourceId], &TargetMode))
-        {
-            WARN(("not expected 2?"));
-            fSupported = FALSE;
-            break;
-        }
-
-#if 0
-        const CR_SORTARRAY *pSupportedModes = VBoxWddmVModesGet(pDevExt, VidPnTargetId);
-        if (!CrSaCovers(pSupportedModes, &TargetMode))
-        {
-            WARN(("not expected 3?"));
-            fSupported = FALSE;
-            break;
-        }
-#endif
     }
 
@@ -1765 +1690 @@
     *pfSupported = fSupported;
 done:
-
-    CrSaCleanup(&TargetMode);
-
-    for (uint32_t i = 0; i < (uint32_t)VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
-    {
-        CrSaCleanup(&aModes[i]);
-    }
-
 
     return Status;