儲存庫 vbox 的更動 37189

時間撮記:

2011-5-23 下午08:50:29 (14 年 以前)

作者:

vboxsync

訊息:

wddm: more VidPn fixes & cleanup

位置:

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

檔案:

• VBoxMPVidPn.cpp (修改) (2 筆差異)
• VBoxMPVidPn.h (修改) (1 筆差異)
• VBoxMPWddm.cpp (修改) (3 筆差異)

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

@@ -742 +742 @@
 NTSTATUS vboxVidPnCheckAddMonitorModes(PVBOXMP_DEVEXT pDevExt,
         D3DDDI_VIDEO_PRESENT_TARGET_ID targetId, D3DKMDT_MONITOR_CAPABILITIES_ORIGIN enmOrigin,
-        D3DKMDT_2DREGION *pResolutions, uint32_t cResolutions, int32_t iPreferred)
+        D3DKMDT_2DREGION *pResolutions, uint32_t cResolutions)
 {
     NTSTATUS Status;
@@ -776 +776 @@
                                 pRes,
                                 enmOrigin,
-                                FALSE//i == (uint32_t)iPreferred
+                                FALSE
                                 );
                         Assert(Status == STATUS_SUCCESS);

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

@@ -129 +129 @@
 NTSTATUS vboxVidPnCheckAddMonitorModes(PVBOXMP_DEVEXT pDevExt,
         D3DDDI_VIDEO_PRESENT_TARGET_ID targetId, D3DKMDT_MONITOR_CAPABILITIES_ORIGIN enmOrigin,
-        D3DKMDT_2DREGION *pResolutions, uint32_t cResolutions, int32_t iPreferred);
+        D3DKMDT_2DREGION *pResolutions, uint32_t cResolutions);
 
 NTSTATUS vboxVidPnCofuncModalityForPath(PVBOXVIDPNCOFUNCMODALITY pCbContext, D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId, D3DDDI_VIDEO_PRESENT_TARGET_ID VidPnTargetId);

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

@@ -3642 +3642 @@
         VIDEO_MODE_INFORMATION *pResModes = NULL;
         uint32_t cResModes = 0;
-        for (int i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+        int i;
+        for (i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
         {
             /* @todo: check that we actually need the current source->target */
@@ -3650 +3651 @@
             Resolution.cx = pModeInfo->VisScreenWidth;
             Resolution.cy = pModeInfo->VisScreenHeight;
-            Status = vboxVidPnCheckAddMonitorModes(pDevExt, i, D3DKMDT_MCO_DRIVER, &Resolution, 1, 0);
+            Status = vboxVidPnCheckAddMonitorModes(pDevExt, i, D3DKMDT_MCO_DRIVER, &Resolution, 1);
             Assert(Status == STATUS_SUCCESS);
             if (Status != STATUS_SUCCESS)
@@ -3657 +3658 @@
                 break;
             }
-
+        }
+
+        for (i = 0; i < VBoxCommonFromDeviceExt(pDevExt)->cDisplays; ++i)
+        {
+            D3DKMDT_2DREGION Resolution;
+            PVBOXWDDM_VIDEOMODES_INFO pInfo = &pInfos[i];
+            VIDEO_MODE_INFORMATION *pModeInfo = &pInfo->aModes[pInfo->iPreferredMode];
+            Resolution.cx = pModeInfo->VisScreenWidth;
+            Resolution.cy = pModeInfo->VisScreenHeight;
             int32_t iPreferableResMode;
             uint32_t cActualResModes;