Changeset 95009 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

May 13, 2022 4:45:53 PM (3 years ago)

Author:

vboxsync

Message:

WDDM: report both RGB and BGR graphics modes. bugref:9845

Location:

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

Files:

• VBoxMPVModes.cpp (modified) (1 diff)
• VBoxMPVidPn.cpp (modified) (3 diffs)

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

@@ -110 +110 @@
     { 1024,  768 },
     { 1152,  864 },
+    { 1280,  720 },
     { 1280,  960 },
     { 1280, 1024 },

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

@@ -183 +183 @@
 }
 
-static void vboxVidPnPopulateSourceModeInfo(D3DKMDT_VIDPN_SOURCE_MODE *pNewVidPnSourceModeInfo, const RTRECTSIZE *pSize)
+static void vboxVidPnPopulateSourceModeInfo(D3DKMDT_VIDPN_SOURCE_MODE *pNewVidPnSourceModeInfo, const RTRECTSIZE *pSize, D3DDDIFORMAT PixelFormat = D3DDDIFMT_A8R8G8B8)
 {
     /* this is a graphics mode */
@@ -191 +191 @@
     pNewVidPnSourceModeInfo->Format.Graphics.VisibleRegionSize = pNewVidPnSourceModeInfo->Format.Graphics.PrimSurfSize;
     pNewVidPnSourceModeInfo->Format.Graphics.Stride = pSize->cx * 4;
-    pNewVidPnSourceModeInfo->Format.Graphics.PixelFormat = D3DDDIFMT_A8R8G8B8;
+    pNewVidPnSourceModeInfo->Format.Graphics.PixelFormat = PixelFormat;
     Assert(pNewVidPnSourceModeInfo->Format.Graphics.PixelFormat != D3DDDIFMT_UNKNOWN);
     pNewVidPnSourceModeInfo->Format.Graphics.ColorBasis = D3DKMDT_CB_SRGB;
@@ -542 +542 @@
         RTRECTSIZE size = CR_U642RSIZE(CrSaGetVal(pArray, i));
 
-        D3DKMDT_VIDPN_SOURCE_MODE *pVidPnModeInfo;
-        NTSTATUS Status = pVidPnModeSetInterface->pfnCreateNewModeInfo(hVidPnModeSet, &pVidPnModeInfo);
-        if (!NT_SUCCESS(Status))
-        {
-            WARN(("pfnCreateNewModeInfo failed, Status 0x%x", Status));
-            return Status;
-        }
-
-        vboxVidPnPopulateSourceModeInfo(pVidPnModeInfo, &size);
-
-        Status = pVidPnModeSetInterface->pfnAddMode(hVidPnModeSet, pVidPnModeInfo);
-        if (!NT_SUCCESS(Status))
-        {
-            WARN(("pfnAddMode (%d x %d) failed, Status 0x%x", size.cx, size.cy, Status));
-            VBoxVidPnDumpSourceMode("SourceMode: ", pVidPnModeInfo, "\n");
-            NTSTATUS rcNt2 = pVidPnModeSetInterface->pfnReleaseModeInfo(hVidPnModeSet, pVidPnModeInfo);
-            AssertNtStatusSuccess(rcNt2);
-            // Continue adding modes into modeset even if a mode was rejected
-            continue;
+        for (uint32_t m = 0; m < 2; ++m)
+        {
+            D3DKMDT_VIDPN_SOURCE_MODE *pVidPnModeInfo;
+            NTSTATUS Status = pVidPnModeSetInterface->pfnCreateNewModeInfo(hVidPnModeSet, &pVidPnModeInfo);
+            if (!NT_SUCCESS(Status))
+            {
+                WARN(("pfnCreateNewModeInfo failed, Status 0x%x", Status));
+                return Status;
+            }
+
+            vboxVidPnPopulateSourceModeInfo(pVidPnModeInfo, &size, m == 0 ? D3DDDIFMT_A8R8G8B8 : D3DDDIFMT_A8B8G8R8);
+
+            Status = pVidPnModeSetInterface->pfnAddMode(hVidPnModeSet, pVidPnModeInfo);
+            if (!NT_SUCCESS(Status))
+            {
+                WARN(("pfnAddMode (%d x %d) failed, Status 0x%x", size.cx, size.cy, Status));
+                VBoxVidPnDumpSourceMode("SourceMode: ", pVidPnModeInfo, "\n");
+                NTSTATUS rcNt2 = pVidPnModeSetInterface->pfnReleaseModeInfo(hVidPnModeSet, pVidPnModeInfo);
+                AssertNtStatusSuccess(rcNt2);
+                // Continue adding modes into modeset even if a mode was rejected
+                continue;
+            }
         }
     }