Changeset 27230 in vbox

Timestamp:

Mar 9, 2010 6:22:04 PM (15 years ago)

Author:

vboxsync

Message:

wddm: VidPn bugfix

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVidPn.cpp (modified) (20 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVidPn.cpp

@@ -42 +42 @@
             {
                 dprintf(("unsupported Scaling (%d)\n", pNewVidPnPresentPathInfo->ContentTransformation.Scaling));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -49 +50 @@
             {
                 dprintf(("unsupported Scaling support (Stretched)\n"));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -57 +59 @@
             {
                 dprintf(("\"Identity\" or \"Centered\" Scaling support not set\n"));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -65 +68 @@
             {
                 dprintf(("unsupported rotation (%d)\n", pNewVidPnPresentPathInfo->ContentTransformation.Rotation));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -74 +78 @@
             {
                 dprintf(("unsupported RotationSupport\n"));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -81 +86 @@
             {
                 dprintf(("\"Identity\" RotationSupport not set\n"));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -91 +97 @@
                         pNewVidPnPresentPathInfo->VisibleFromActiveTLOffset.cx,
                         pNewVidPnPresentPathInfo->VisibleFromActiveTLOffset.cy));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -101 +108 @@
                         pNewVidPnPresentPathInfo->VisibleFromActiveBROffset.cx,
                         pNewVidPnPresentPathInfo->VisibleFromActiveBROffset.cy));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -109 +117 @@
             {
                 dprintf(("unsupported VidPnTargetColorBasis (%d)\n", pNewVidPnPresentPathInfo->VidPnTargetColorBasis));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -122 +131 @@
             {
                 dprintf(("Non-zero FourthChannel (%d)\n", pNewVidPnPresentPathInfo->VidPnTargetColorCoeffDynamicRanges.FourthChannel));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -133 +143 @@
             {
                 dprintf(("Copy protection not supported CopyProtectionType(%d)\n", pNewVidPnPresentPathInfo->CopyProtection.CopyProtectionType));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -140 +151 @@
             {
                 dprintf(("Copy protection not supported APSTriggerBits(%d)\n", pNewVidPnPresentPathInfo->CopyProtection.APSTriggerBits));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -149 +161 @@
             {
                 dprintf(("Copy protection support (0x%x)\n", *((UINT*)&pNewVidPnPresentPathInfo->CopyProtection.CopyProtectionSupport)));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -156 +169 @@
             {
                 dprintf(("Unsupported GammaRamp.Type (%d)\n", pNewVidPnPresentPathInfo->GammaRamp.Type));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -223 +237 @@
                         pNewVidPnSourceModeInfo->Format.Graphics.PrimSurfSize.cx,
                         pNewVidPnSourceModeInfo->Format.Graphics.PrimSurfSize.cy));
+                AssertBreakpoint();
                 bSupported = FALSE;
                 break;
@@ -295 +310 @@
 }
 
+NTSTATUS vboxVidPnPopulateVideoSignalInfo(D3DKMDT_VIDEO_SIGNAL_INFO *pVsi,
+        D3DKMDT_2DREGION *pResolution,
+        ULONG VSync)
+{
+    NTSTATUS Status = STATUS_SUCCESS;
+
+    pVsi->VideoStandard  = D3DKMDT_VSS_VESA_DMT;
+    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->PixelRate = pVsi->TotalSize.cx * pVsi->TotalSize.cy * VSync;
+    pVsi->HSyncFreq.Numerator = (UINT)((pVsi->PixelRate / pVsi->TotalSize.cy) * 1000);
+    pVsi->HSyncFreq.Denominator = 1000;
+    pVsi->ScanLineOrdering = D3DDDI_VSSLO_PROGRESSIVE;
+
+    return Status;
+}
+
 NTSTATUS vboxVidPnCheckTargetModeInfo(const D3DKMDT_HVIDPN hDesiredVidPn,
         const D3DKMDT_VIDPN_TARGET_MODE *pNewVidPnTargetModeInfo,
@@ -300 +335 @@
 {
     BOOLEAN bSupported = TRUE;
-    do
-    {
-        /* video standatd does not matter ??
-        pNewVidPnTargetModeInfo->VideoSignalInfo.VideoStandard
-
-        we support any total size??
-        pNewVidPnTargetModeInfo->VideoSignalInfo.TotalSize.cx
-        pNewVidPnTargetModeInfo->VideoSignalInfo.TotalSize.cy
-        */
-        /* ActualSize should be same as total size??*/
-        if (pNewVidPnTargetModeInfo->VideoSignalInfo.ActiveSize.cx != pNewVidPnTargetModeInfo->VideoSignalInfo.TotalSize.cx
-                || pNewVidPnTargetModeInfo->VideoSignalInfo.ActiveSize.cy != pNewVidPnTargetModeInfo->VideoSignalInfo.TotalSize.cy)
-        {
-            dprintf(("ActiveSize(%d, %d) !=  TotalSize(%d, %d)\n",
-                    pNewVidPnTargetModeInfo->VideoSignalInfo.ActiveSize.cx,
-                    pNewVidPnTargetModeInfo->VideoSignalInfo.ActiveSize.cy,
-                    pNewVidPnTargetModeInfo->VideoSignalInfo.TotalSize.cx,
-                    pNewVidPnTargetModeInfo->VideoSignalInfo.TotalSize.cy));
-            bSupported = FALSE;
-            break;
-        }
-
-        /* we do not care about those
-        pNewVidPnTargetModeInfo->VideoSignalInfo.VSyncFreq.Numerator
-        pNewVidPnTargetModeInfo->VideoSignalInfo.VSyncFreq.Denominator
-        pNewVidPnTargetModeInfo->VideoSignalInfo.HSyncFreq.Numerator
-        pNewVidPnTargetModeInfo->VideoSignalInfo.HSyncFreq.Denominator
-        pNewVidPnTargetModeInfo->VideoSignalInfo.PixelRate
-        pNewVidPnTargetModeInfo->VideoSignalInfo.ScanLineOrdering
-        pNewVidPnTargetModeInfo->Preference
-        */
-    } while (1);
+    D3DKMDT_VIDEO_SIGNAL_INFO CmpVsi;
+    D3DKMDT_2DREGION CmpRes;
+    CmpRes.cx = pNewVidPnTargetModeInfo->VideoSignalInfo.ActiveSize.cx;
+    CmpRes.cy = pNewVidPnTargetModeInfo->VideoSignalInfo.ActiveSize.cy;
+    NTSTATUS Status = vboxVidPnPopulateVideoSignalInfo(&CmpVsi,
+                &CmpRes,
+                pNewVidPnTargetModeInfo->VideoSignalInfo.VSyncFreq.Numerator/pNewVidPnTargetModeInfo->VideoSignalInfo.VSyncFreq.Denominator);
+    Assert(Status == STATUS_SUCCESS);
+    if (Status != STATUS_SUCCESS)
+    {
+        drprintf((__FUNCTION__": vboxVidPnPopulateVideoSignalInfo error Status (0x%x)\n", Status));
+        return Status;
+    }
+
+    if (memcmp(&CmpRes, &pNewVidPnTargetModeInfo->VideoSignalInfo, sizeof (D3DKMDT_VIDEO_SIGNAL_INFO)))
+    {
+        dfprintf((__FUNCTION__": VideoSignalInfos do not match!!!\n"));
+        AssertBreakpoint();
+        bSupported = FALSE;
+    }
 
     *pbSupported = bSupported;
@@ -524 +547 @@
 }
 
-NTSTATUS vboxVidPnPopulateVideoSignalInfo(PDEVICE_EXTENSION pDevExt,
-        D3DKMDT_VIDEO_SIGNAL_INFO *pVsi,
-        D3DKMDT_2DREGION *pResolution,
-        ULONG VSync)
-{
-    NTSTATUS Status = STATUS_SUCCESS;
-
-    pVsi->VideoStandard  = D3DKMDT_VSS_VESA_DMT;
-    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->PixelRate = pVsi->TotalSize.cx * pVsi->TotalSize.cy * VSync;
-    pVsi->HSyncFreq.Numerator = (UINT)((pVsi->PixelRate / pVsi->TotalSize.cy) * 1000);
-    pVsi->HSyncFreq.Denominator = 1000;
-    pVsi->ScanLineOrdering = D3DDDI_VSSLO_PROGRESSIVE;
-
-    return Status;
-}
-
 NTSTATUS vboxVidPnPopulateMonitorSourceModeInfoFromLegacy(PDEVICE_EXTENSION pDevExt,
         D3DKMDT_MONITOR_SOURCE_MODE *pMonitorSourceMode,
@@ -551 +553 @@
         BOOLEAN bPreferred)
 {
-    NTSTATUS Status = vboxVidPnPopulateVideoSignalInfo(pDevExt, &pMonitorSourceMode->VideoSignalInfo, pResolution, 60 /* ULONG VSync */);
+    NTSTATUS Status = vboxVidPnPopulateVideoSignalInfo(&pMonitorSourceMode->VideoSignalInfo, pResolution, 60 /* ULONG VSync */);
     Assert(Status == STATUS_SUCCESS);
     if (Status == STATUS_SUCCESS)
@@ -574 +576 @@
     pNewVidPnTargetModeInfo->Preference = bPreferred ? D3DKMDT_MP_PREFERRED : D3DKMDT_MP_NOTPREFERRED;
 
-    return vboxVidPnPopulateVideoSignalInfo(pDevExt, &pNewVidPnTargetModeInfo->VideoSignalInfo, pResolution, 60 /* ULONG VSync */);
+    return vboxVidPnPopulateVideoSignalInfo(&pNewVidPnTargetModeInfo->VideoSignalInfo, pResolution, 60 /* ULONG VSync */);
 }