Changeset 26324 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Timestamp:

Feb 8, 2010 1:03:29 PM (15 years ago)

Author:

vboxsync

Message:

wddm: more VidPn impl

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Miniport

Files:

• VBoxVideo.cpp (modified) (4 diffs)
• VBoxVideo.h (modified) (2 diffs)
• wddm/VBoxVideoVidPn.cpp (modified) (5 diffs)
• wddm/VBoxVideoWddm.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.cpp

@@ -172 +172 @@
 /* preferred mode index */
 static uint32_t gPreferredVideoMode = 0;
+
+static D3DKMDT_2DREGION g_VBoxWddmVideoResolutions[RT_ELEMENTS(VideoModes)];
+static uint32_t g_VBoxWddmNumResolutions;
+
+DECLINLINE(int) vboxWddmRectComparator(const D3DKMDT_2DREGION *pReg1, const D3DKMDT_2DREGION *pReg2)
+{
+    int tmp = pReg1->cx - pReg2->cx;
+    if(tmp)
+        return tmp;
+    tmp = pReg1->cy - pReg2->cy;
+    return tmp;
+}
+
+/* builds a g_VBoxWddmVideoResolutions given VideoModes info */
+VOID vboxWddmBuildResolutionTable()
+{
+    g_VBoxWddmNumResolutions = 0;
+
+    /* we don't care about the efficiency at this time */
+    for (uint32_t i = 0; i < gNumVideoModes; ++i)
+    {
+        VIDEO_MODE_INFORMATION *pMode = &VideoModes[i];
+        bool bFound = false;
+        for (uint32_t j = 0; j < g_VBoxWddmNumResolutions; ++j)
+        {
+            if (g_VBoxWddmVideoResolutions[j].cx == pMode->VisScreenWidth
+                    && g_VBoxWddmVideoResolutions[j].cy == pMode->VisScreenHeight)
+            {
+                bFound = true;
+                break;
+            }
+        }
+
+        if (!bFound)
+        {
+            g_VBoxWddmVideoResolutions[g_VBoxWddmNumResolutions].cx = pMode->VisScreenWidth;
+            g_VBoxWddmVideoResolutions[g_VBoxWddmNumResolutions].cy = pMode->VisScreenHeight;
+        }
+    }
+}
 #endif
 
@@ -893 +933 @@
 #endif
 
+#ifdef VBOXWDDM
+    vboxWddmBuildResolutionTable();
+#endif
+
     VBoxVideoCmnRegFini(Reg);
 }
@@ -903 +947 @@
  * or the available VRAM does not allow for additional modes.
  */
-VOID VBoxWddmGetModesTable(PDEVICE_EXTENSION DeviceExtension, bool bRebuildTable, VIDEO_MODE_INFORMATION ** ppModes, uint32_t * pcModes, uint32_t * pPreferrableMode)
+VOID VBoxWddmGetModesTable(PDEVICE_EXTENSION DeviceExtension, bool bRebuildTable,
+        VIDEO_MODE_INFORMATION ** ppModes, uint32_t * pcModes, uint32_t * pPreferrableMode,
+        D3DKMDT_2DREGION **ppResolutions, uint32_t * pcResolutions)
 {
     static bool bTableInitialized = false;
@@ -915 +961 @@
     *pcModes = gNumVideoModes;
     *pPreferrableMode = gPreferredVideoMode;
+    *ppResolutions = g_VBoxWddmVideoResolutions;
+    *pcResolutions = g_VBoxWddmNumResolutions;
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/VBoxVideo.h

@@ -624 +624 @@
 RT_C_DECLS_END
 
-VOID VBoxWddmGetModesTable(PDEVICE_EXTENSION DeviceExtension, bool bRebuildTable, VIDEO_MODE_INFORMATION ** ppModes, uint32_t * pcModes, uint32_t * pPreferrableMode);
+VOID VBoxWddmGetModesTable(PDEVICE_EXTENSION DeviceExtension, bool bRebuildTable,
+        VIDEO_MODE_INFORMATION ** ppModes, uint32_t * pcModes, uint32_t * pPreferrableMode,
+        D3DKMDT_2DREGION **pResolutions, uint32_t * pcResolutions);
+
 D3DDDIFORMAT vboxWddmCalcPixelFormat(VIDEO_MODE_INFORMATION *pInfo);
 UINT vboxWddmCalcBitsPerPixel(D3DDDIFORMAT format);
@@ -656 +659 @@
     uint32_t iPreferredMode;
     VIDEO_MODE_INFORMATION *pModes;
+    uint32_t cResolutions;
+    D3DKMDT_2DREGION *pResolutions;
 }VBOXVIDPNCOFUNCMODALITY, *PVBOXVIDPNCOFUNCMODALITY;
 

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

@@ -498 +498 @@
 NTSTATUS vboxVidPnPopulateTargetModeInfoFromLegacy(PDEVICE_EXTENSION pDevExt,
         D3DKMDT_VIDPN_TARGET_MODE *pNewVidPnTargetModeInfo,
-        VIDEO_MODE_INFORMATION *pMode)
+        D3DKMDT_2DREGION *pResolution,
+        BOOLEAN bPreferred)
 {
     NTSTATUS Status = STATUS_SUCCESS;
-#if 0
-    todo();
-    if (pMode->AttributeFlags & VIDEO_MODE_GRAPHICS)
-    {
-        /* this is a graphics mode */
-        pNewVidPnSourceModeInfo->Type = D3DKMDT_RMT_GRAPHICS;
-        pNewVidPnSourceModeInfo->Format.Graphics.PrimSurfSize.cx = pMode->VisScreenWidth;
-        pNewVidPnSourceModeInfo->Format.Graphics.PrimSurfSize.cy = pMode->VisScreenHeight;
-        pNewVidPnSourceModeInfo->Format.Graphics.VisibleRegionSize = pNewVidPnSourceModeInfo->Format.Graphics.PrimSurfSize;
-        pNewVidPnSourceModeInfo->Format.Graphics.Stride = pMode->ScreenStride;
-        pNewVidPnSourceModeInfo->Format.Graphics.PixelFormat = vboxWddmCalcPixelFormat(pInfo);
-        Assert(pNewVidPnSourceModeInfo->Format.Graphics.PixelFormat != D3DDDIFMT_UNKNOWN);
-        if (pNewVidPnSourceModeInfo->Format.Graphics.PixelFormat != D3DDDIFMT_UNKNOWN)
-        {
-            pNewVidPnSourceModeInfo->Format.Graphics.ColorBasis = D3DKMDT_CB_SRGB;
-            if (pNewVidPnSourceModeInfo->Format.Graphics.PixelFormat == D3DDDIFMT_P8)
-                pNewVidPnSourceModeInfo->Format.Graphics.PixelValueAccessMode = D3DKMDT_PVAM_SETTABLEPALETTE;
-            else
-                pNewVidPnSourceModeInfo->Format.Graphics.PixelValueAccessMode = D3DKMDT_PVAM_DIRECT;
-        }
-        else
-        {
-            drprintf((__FUNCTION__": vboxWddmCalcPixelFormat failed\n"));
-            Status = STATUS_INVALID_PARAMETER;
-        }
-    }
-    else
-    {
-        /* @todo: XPDM driver does not seem to return text modes, should we? */
-        drprintf((__FUNCTION__": text mode not supported currently\n"));
-        AssertBreakPoint();
-        Status = STATUS_INVALID_PARAMETER;
-    }
-#endif
+
+    pNewVidPnTargetModeInfo->VideoSignalInfo.VideoStandard  = D3DKMDT_VSS_VESA_DMT;
+    pNewVidPnTargetModeInfo->VideoSignalInfo.TotalSize = *pResolution;
+    pNewVidPnTargetModeInfo->VideoSignalInfo.ActiveSize = pNewVidPnTargetModeInfo->VideoSignalInfo.TotalSize;
+    pNewVidPnTargetModeInfo->VideoSignalInfo.VSyncFreq.Numerator = 60000;
+    pNewVidPnTargetModeInfo->VideoSignalInfo.VSyncFreq.Denominator = 1000;
+    pNewVidPnTargetModeInfo->VideoSignalInfo.HSyncFreq.Numerator = pNewVidPnTargetModeInfo->VideoSignalInfo.ActiveSize.cy * 60 * 1.05;
+    pNewVidPnTargetModeInfo->VideoSignalInfo.HSyncFreq.Denominator = 1;
+    pNewVidPnTargetModeInfo->VideoSignalInfo.PixelRate = 165000; /* @todo: ? */
+    pNewVidPnTargetModeInfo->VideoSignalInfo.ScanLineOrdering = D3DDDI_VSSLO_PROGRESSIVE;
+    pNewVidPnTargetModeInfo->Preference = bPreferred ? D3DKMDT_MP_PREFERRED : D3DKMDT_MP_NOTPREFERRED;
+
     return Status;
 }
@@ -541 +520 @@
         D3DKMDT_HVIDPNTARGETMODESET hNewVidPnTargetModeSet,
         const DXGK_VIDPNTARGETMODESET_INTERFACE *pNewVidPnTargetModeSetInterface,
-        VIDEO_MODE_INFORMATION *pModes,
-        uint32_t cModes,
-        uint32_t iPreferredMomde)
+        D3DKMDT_2DREGION *pResolutions,
+        uint32_t cResolutions,
+        VIDEO_MODE_INFORMATION *pPreferredMode)
 {
     NTSTATUS Status = STATUS_SUCCESS;
-    for (uint32_t i = 0; i < cModes; ++i)
+    for (uint32_t i = 0; i < cResolutions; ++i)
     {
         D3DKMDT_VIDPN_TARGET_MODE *pNewVidPnTargetModeInfo;
@@ -553 +532 @@
         if (Status == STATUS_SUCCESS)
         {
-            Status = vboxVidPnPopulateTargetModeInfoFromLegacy(pDevExt, pNewVidPnTargetModeInfo, &pModes[i]);
+            bool bPreferred = pPreferredMode->VisScreenHeight == pResolutions[i].cx
+                    && pPreferredMode->VisScreenWidth == pResolutions[i].cy;
+            Status = vboxVidPnPopulateTargetModeInfoFromLegacy(pDevExt, pNewVidPnTargetModeInfo, &pResolutions[i], bPreferred);
             Assert(Status == STATUS_SUCCESS);
             if (Status == STATUS_SUCCESS)
@@ -603 +584 @@
     uint32_t cModes = pCbContext->cModes;
     uint32_t iPreferredMode = pCbContext->iPreferredMode;
+    uint32_t cResolutions = pCbContext->cResolutions;
+    D3DKMDT_2DREGION * pResolutions = pCbContext->pResolutions;
+
 
     /* adjust scaling */
@@ -733 +717 @@
                             Status = vboxVidPnPopulateTargetModeSetFromLegacy(pDevExt,
                                     hNewVidPnTargetModeSet, pNewVidPnTargetModeSetInterface,
-                                    pModes, cModes, iPreferredMode);
+                                    pResolutions, cResolutions, &pModes[iPreferredMode]);
                             Assert(Status == STATUS_SUCCESS);
                             if (Status == STATUS_SUCCESS)

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

@@ -1507 +1507 @@
             VBOXVIDPNCOFUNCMODALITY CbContext = {0};
             CbContext.pEnumCofuncModalityArg = pEnumCofuncModalityArg;
-            VBoxWddmGetModesTable(pContext, true, &CbContext.pModes, &CbContext.cModes, &CbContext.iPreferredMode);
+            VBoxWddmGetModesTable(pContext, true, &CbContext.pModes, &CbContext.cModes, &CbContext.iPreferredMode, &CbContext.cResolutions, &CbContext.pResolutions);
             Assert(CbContext.cModes);
             Assert(CbContext.cModes > CbContext.iPreferredMode);