Changeset 42217 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVidPn.cpp

Timestamp:

Jul 18, 2012 8:41:29 PM (12 years ago)

Author:

vboxsync

Message:

wddm: autoresize, etc. fixes, more to follow..

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVidPn.cpp (modified) (7 diffs)

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

@@ -219 +219 @@
     NTSTATUS Status = STATUS_SUCCESS;
 
-    pVsi->VideoStandard  = D3DKMDT_VSS_VESA_DMT;
+    pVsi->VideoStandard  = D3DKMDT_VSS_OTHER;
     pVsi->ActiveSize = *pResolution;
     pVsi->VSyncFreq.Numerator = VSync * 1000;
     pVsi->VSyncFreq.Denominator = 1000;
-    pVsi->TotalSize.cx = pVsi->ActiveSize.cx + VBOXVDPN_C_DISPLAY_HBLANK_SIZE;
-    pVsi->TotalSize.cy = pVsi->ActiveSize.cy + VBOXVDPN_C_DISPLAY_VBLANK_SIZE;
+    pVsi->TotalSize.cx = pVsi->ActiveSize.cx;// + VBOXVDPN_C_DISPLAY_HBLANK_SIZE;
+    pVsi->TotalSize.cy = pVsi->ActiveSize.cy;// + VBOXVDPN_C_DISPLAY_VBLANK_SIZE;
     pVsi->PixelRate = pVsi->TotalSize.cx * pVsi->TotalSize.cy * VSync;
     pVsi->HSyncFreq.Numerator = (UINT)((pVsi->PixelRate / pVsi->TotalSize.cy) * 1000);
@@ -527 +527 @@
     D3DKMDT_2DREGION *paResolutions;
     uint32_t cResolutions;
-    BOOLEAN fMatch;
+    BOOLEAN fMatched;
 } VBOXVIDPNMATCHMONMODESENUM, *PVBOXVIDPNMATCHMONMODESENUM;
 
@@ -535 +535 @@
     PVBOXVIDPNMATCHMONMODESENUM pInfo = (PVBOXVIDPNMATCHMONMODESENUM)pContext;
 
-    Assert(pInfo->fMatch);
+    Assert(pInfo->fMatched);
+
+    BOOLEAN fFound = FALSE;
 
     for (UINT i = 0; i < pInfo->cResolutions; ++i)
     {
         D3DKMDT_2DREGION *pResolution = &pInfo->paResolutions[i];
-        if (pMonitorSMI->VideoSignalInfo.ActiveSize.cx != pResolution->cx
-                || pMonitorSMI->VideoSignalInfo.ActiveSize.cy != pResolution->cy)
-        {
-            pInfo->fMatch = FALSE;
+        if (pMonitorSMI->VideoSignalInfo.ActiveSize.cx == pResolution->cx
+                && pMonitorSMI->VideoSignalInfo.ActiveSize.cy == pResolution->cy)
+        {
+            fFound = TRUE;
             break;
         }
     }
 
+    if (!fFound)
+        pInfo->fMatched = FALSE;
+
     pMonitorSMSIf->pfnReleaseModeInfo(hMonitorSMS, pMonitorSMI);
 
-    return pInfo->fMatch;
+    return pInfo->fMatched;
 }
 
@@ -585 +590 @@
     }
 
-    VBOXVIDPNMATCHMONMODESENUM Info;
-    Info.paResolutions = pResolutions;
-    Info.cResolutions = cResolutions;
-    Info.fMatch = TRUE;
-
-    Status = vboxVidPnEnumMonitorSourceModes(hMonitorSMS, pMonitorSMSIf, vboxFidPnMatchMonitorModesEnum, &Info);
+    /* we care only about monitor modes covering all needed resolutions,
+     * we do NOT care if resolutions do not cover some monitor modes */
+    SIZE_T cModes = 0;
+    Status = pMonitorSMSIf->pfnGetNumModes(hMonitorSMS, &cModes);
     if (NT_SUCCESS(Status))
     {
-        *pfMatch = Info.fMatch;
-    }
+        if (cModes < cResolutions)
+            *pfMatch = FALSE;
+        else
+        {
+            VBOXVIDPNMATCHMONMODESENUM Info;
+            Info.paResolutions = pResolutions;
+            Info.cResolutions = cResolutions;
+            Info.fMatched = TRUE;
+
+            Status = vboxVidPnEnumMonitorSourceModes(hMonitorSMS, pMonitorSMSIf, vboxFidPnMatchMonitorModesEnum, &Info);
+            if (NT_SUCCESS(Status))
+                *pfMatch = Info.fMatched;
+        }
+    }
+    else
+        WARN(("pfnGetNumModes failed, Status 0x%x", Status));
 
     NTSTATUS tmpStatus = pMonitorInterface->pfnReleaseMonitorSourceModeSet(pDevExt->u.primary.DxgkInterface.DeviceHandle, hMonitorSMS);
@@ -1299 +1316 @@
                     {
                         Status = vboxVidPnPopulateTargetModeInfoFromLegacy(pNewVidPnTargetModeInfo, pResolution, i == pInfo->iPreferredResolution);
-                        Assert(Status == STATUS_SUCCESS);
                         if (NT_SUCCESS(Status))
                         {
@@ -1309 +1325 @@
                                 continue;
                             }
+                            else
+                            {
+                                WARN(("pfnAddMode failed, Status 0x%x", Status));
+                            }
+                        }
+                        else
+                        {
+                            WARN(("vboxVidPnPopulateTargetModeInfoFromLegacy failed, Status 0x%x", Status));
                         }
 
@@ -1314 +1338 @@
                         Assert(tmpStatus == STATUS_SUCCESS);
                     }
+
                     /* we're here because of an error */
                     Assert(!NT_SUCCESS(Status));
-                    break;
+                    /* ignore mode addition failure */
+                    Status = STATUS_SUCCESS;
+                    continue;
                 }
             }