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

Timestamp:

Sep 21, 2010 5:12:27 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: auto-resize & fullscreen working for Aero

Location:

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

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxVideo.cpp (modified) (6 diffs)
• VBoxVideo.h (modified) (1 diff)
• wddm/VBoxVideoWddm.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/Makefile.kmk

@@ -90 +90 @@
  endif
  VBoxVideoWddm_DEFS       += LOG_ENABLED
+ #VBoxVideoWddm_DEFS       += VBOX_WITH_MULTIMONITOR_FIX
  #VBoxVideoWddm_DEFS       += LOG_TO_BACKDOOR
  VBoxVideoWddm_INCS       += ../../include

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

@@ -51 +51 @@
  */
 #ifndef VBOX_WITH_MULTIMONITOR_FIX
-ULONG gCustomXRes = 0;
-ULONG gCustomYRes = 0;
-ULONG gCustomBPP  = 0;
+uint32_t gCustomXRes = 0;
+uint32_t gCustomYRes = 0;
+uint32_t gCustomBPP  = 0;
 #endif /* !VBOX_WITH_MULTIMONITOR_FIX */
 
@@ -333 +333 @@
         { 1600, 1200 },
         { 1920, 1440 },
+#ifndef VBOX_WITH_WDDM
         /* multi screen modes with 1280x1024 */
         { 2560, 1024 },
@@ -341 +342 @@
         { 4800, 1200 },
         { 6400, 1200 },
+#endif
     };
     size_t matrixSize = sizeof(resolutionMatrix) / sizeof(resolutionMatrix[0]);
@@ -1797 +1799 @@
 #endif /* !VBOX_WITH_HGSMI */
 
+void vboxVideoInitCustomVideoModes(PDEVICE_EXTENSION pDevExt)
+{
+    VP_STATUS status;
+    VBOXCMNREG Reg;
+
+    VBoxVideoCmnRegInit(pDevExt, &Reg);
+
+    dprintf(("VBoxVideo::vboxVideoInitCustomVideoModes\n"));
+
+#ifndef VBOX_WITH_MULTIMONITOR_FIX
+    /*
+     * Get the last custom resolution
+     */
+    status = VBoxVideoCmnRegQueryDword(Reg, L"CustomXRes", &gCustomXRes);
+    if (status != NO_ERROR)
+        gCustomXRes = 0;
+
+    status = VBoxVideoCmnRegQueryDword(Reg, L"CustomYRes", &gCustomYRes);
+    if (status != NO_ERROR)
+        gCustomYRes = 0;
+    status = VBoxVideoCmnRegQueryDword(Reg, L"CustomBPP", &gCustomBPP);
+    if (status != NO_ERROR)
+        gCustomBPP = 0;
+
+   dprintf(("VBoxVideo: got stored custom resolution %dx%dx%d\n", gCustomXRes, gCustomYRes, gCustomBPP));
+#else
+    /* Initialize all custom modes to the 800x600x32. */
+    initVideoModeInformation(&CustomVideoModes[0], 800, 600, 32, 0, 0);
+
+    int iCustomMode;
+    for (iCustomMode = 1; iCustomMode < RT_ELEMENTS(CustomVideoModes); iCustomMode++)
+    {
+        CustomVideoModes[iCustomMode] = CustomVideoModes[0];
+    }
+
+    /* Load stored custom resolution from the registry. */
+    for (iCustomMode = 0;
+#ifdef VBOX_WITH_WDDM
+            iCustomMode < pDevExt->u.primary.cDisplays;
+#else
+            iCustomMode < pDevExt->pPrimary->u.primary.cDisplays;
+#endif
+            iCustomMode++)
+    {
+        /*
+         * Get the last custom resolution
+         */
+        uint32_t CustomXRes = 0, CustomYRes = 0, CustomBPP = 0;
+
+        if (iCustomMode == 0)
+        {
+            /* Name without a suffix */
+            status = VBoxVideoCmnRegQueryDword(Reg, L"CustomXRes", &CustomXRes);
+            if (status != NO_ERROR)
+                CustomXRes = 0;
+            status = VBoxVideoCmnRegQueryDword(Reg, L"CustomYRes", &CustomYRes);
+            if (status != NO_ERROR)
+                CustomYRes = 0;
+            status = VBoxVideoCmnRegQueryDword(Reg, L"CustomBPP", &CustomBPP);
+            if (status != NO_ERROR)
+                CustomBPP = 0;
+        }
+        else
+        {
+            wchar_t keyname[32];
+            swprintf(keyname, L"CustomXRes%d", iCustomMode);
+            status = VBoxVideoCmnRegQueryDword(Reg, keyname, &CustomXRes);
+            if (status != NO_ERROR)
+                CustomXRes = 0;
+            swprintf(keyname, L"CustomYRes%d", iCustomMode);
+            status = VBoxVideoCmnRegQueryDword(Reg, keyname, &CustomYRes);
+            if (status != NO_ERROR)
+                CustomYRes = 0;
+            swprintf(keyname, L"CustomBPP%d", iCustomMode);
+            status = VBoxVideoCmnRegQueryDword(Reg, keyname, &CustomBPP);
+            if (status != NO_ERROR)
+                CustomBPP = 0;
+        }
+
+        dprintf(("VBoxVideo: got stored custom resolution[%d] %dx%dx%d\n", iCustomMode, CustomXRes, CustomYRes, CustomBPP));
+
+        if (CustomXRes || CustomYRes || CustomBPP)
+        {
+            if (CustomXRes == 0)
+            {
+                CustomXRes = CustomVideoModes[iCustomMode].VisScreenWidth;
+            }
+            if (CustomYRes == 0)
+            {
+                CustomYRes = CustomVideoModes[iCustomMode].VisScreenHeight;
+            }
+            if (CustomBPP == 0)
+            {
+                CustomBPP = CustomVideoModes[iCustomMode].BitsPerPlane;
+            }
+
+            initVideoModeInformation(&CustomVideoModes[iCustomMode], CustomXRes, CustomYRes, CustomBPP, 0, 0);
+        }
+    }
+#endif /* VBOX_WITH_MULTIMONITOR_FIX */
+
+    VBoxVideoCmnRegFini(Reg);
+}
+
 #ifndef VBOX_WITH_WDDM
 
@@ -1943 +2049 @@
 BOOLEAN VBoxVideoInitialize(PVOID HwDeviceExtension)
 {
-    VP_STATUS status;
-
     dprintf(("VBoxVideo::VBoxVideoInitialize\n"));
 
@@ -1952 +2056 @@
     pDevExt->u.primary.pvReqFlush = NULL;
 
-#ifndef VBOX_WITH_MULTIMONITOR_FIX
-    /*
-     * Get the last custom resolution
-     */
-    status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                            L"CustomXRes",
-                                            FALSE,
-                                            VBoxRegistryCallback,
-                                            &gCustomXRes);
-    if (status != NO_ERROR)
-        gCustomXRes = 0;
-    status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                            L"CustomYRes",
-                                            FALSE,
-                                            VBoxRegistryCallback,
-                                            &gCustomYRes);
-    if (status != NO_ERROR)
-        gCustomYRes = 0;
-    status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                            L"CustomBPP",
-                                            FALSE,
-                                            VBoxRegistryCallback,
-                                            &gCustomBPP);
-    if (status != NO_ERROR)
-        gCustomBPP = 0;
-
-   dprintf(("VBoxVideo: got stored custom resolution %dx%dx%d\n", gCustomXRes, gCustomYRes, gCustomBPP));
-#else
-    /* Initialize all custom modes to the 800x600x32. */
-    initVideoModeInformation(&CustomVideoModes[0], 800, 600, 32, 0, 0);
-
-    int iCustomMode;
-    for (iCustomMode = 1; iCustomMode < RT_ELEMENTS(CustomVideoModes); iCustomMode++)
-    {
-        CustomVideoModes[iCustomMode] = CustomVideoModes[0];
-    }
-
-    /* Load stored custom resolution from the registry. */
-    PDEVICE_EXTENSION DeviceExtension = (PDEVICE_EXTENSION)HwDeviceExtension;
-    for (iCustomMode = 0; iCustomMode < DeviceExtension->pPrimary->u.primary.cDisplays; iCustomMode++)
-    {
-        /*
-         * Get the last custom resolution
-         */
-        ULONG CustomXRes = 0, CustomYRes = 0, CustomBPP = 0;
-
-        if (iCustomMode == 0)
-        {
-            /* Name without a suffix */
-            status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                                    L"CustomXRes",
-                                                    FALSE,
-                                                    VBoxRegistryCallback,
-                                                    &CustomXRes);
-            if (status != NO_ERROR)
-                CustomXRes = 0;
-            status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                                    L"CustomYRes",
-                                                    FALSE,
-                                                    VBoxRegistryCallback,
-                                                    &CustomYRes);
-            if (status != NO_ERROR)
-                CustomYRes = 0;
-            status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                                    L"CustomBPP",
-                                                    FALSE,
-                                                    VBoxRegistryCallback,
-                                                    &CustomBPP);
-            if (status != NO_ERROR)
-                CustomBPP = 0;
-        }
-        else
-        {
-            wchar_t keyname[32];
-            swprintf(keyname, L"CustomXRes%d", iCustomMode);
-            status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                                    keyname,
-                                                    FALSE,
-                                                    VBoxRegistryCallback,
-                                                    &CustomXRes);
-            if (status != NO_ERROR)
-                CustomXRes = 0;
-            swprintf(keyname, L"CustomYRes%d", iCustomMode);
-            status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                                    keyname,
-                                                    FALSE,
-                                                    VBoxRegistryCallback,
-                                                    &CustomYRes);
-            if (status != NO_ERROR)
-                CustomYRes = 0;
-            swprintf(keyname, L"CustomBPP%d", iCustomMode);
-            status = VideoPortGetRegistryParameters(HwDeviceExtension,
-                                                    keyname,
-                                                    FALSE,
-                                                    VBoxRegistryCallback,
-                                                    &CustomBPP);
-            if (status != NO_ERROR)
-                CustomBPP = 0;
-        }
-
-        dprintf(("VBoxVideo: got stored custom resolution[%d] %dx%dx%d\n", iCustomMode, CustomXRes, CustomYRes, CustomBPP));
-
-        if (CustomXRes || CustomYRes || CustomBPP)
-        {
-            if (CustomXRes == 0)
-            {
-                CustomXRes = CustomVideoModes[iCustomMode].VisScreenWidth;
-            }
-            if (CustomYRes == 0)
-            {
-                CustomYRes = CustomVideoModes[iCustomMode].VisScreenHeight;
-            }
-            if (CustomBPP == 0)
-            {
-                CustomBPP = CustomVideoModes[iCustomMode].BitsPerPlane;
-            }
-
-            initVideoModeInformation(&CustomVideoModes[iCustomMode], CustomXRes, CustomYRes, CustomBPP, 0, 0);
-        }
-    }
-#endif /* VBOX_WITH_MULTIMONITOR_FIX */
+    vboxVideoInitCustomVideoModes(pDevExt);
 
    return TRUE;

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

@@ -655 +655 @@
         D3DKMDT_2DREGION **ppResolutions, uint32_t * pcResolutions);
 
+void vboxVideoInitCustomVideoModes(PDEVICE_EXTENSION pDevExt);
+
 VOID VBoxWddmInvalidateModesTable(PDEVICE_EXTENSION DeviceExtension);
 

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

@@ -193 +193 @@
         return STATUS_INVALID_PARAMETER;
 
+    Assert(0);
     /*
      * Set the current mode into the hardware.
@@ -221 +222 @@
 bool vboxWddmCheckUpdateShadowAddress(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SOURCE pSource, UINT SegmentId, VBOXVIDEOOFFSET offVram)
 {
+    if (pSource->pPrimaryAllocation->enmType == VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC)
+    {
+        Assert(pSource->offVram == VBOXVIDEOOFFSET_VOID);
+        return false;
+    }
     if (pSource->offVram == offVram)
         return false;
@@ -2173 +2179 @@
             VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR *pPrivateData = (VBOXWDDM_DMA_PRIVATEDATA_PRESENTHDR*)pPrivateDataBase;
             VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pPrivateData->SrcAllocInfo.srcId];
+            PVBOXWDDM_ALLOCATION pDstAlloc = pPrivateData->DstAllocInfo.pAlloc;
+            PVBOXWDDM_ALLOCATION pSrcAlloc = pPrivateData->SrcAllocInfo.pAlloc;
+            vboxWddmAssignShadow(pDevExt, pSource, pSrcAlloc, pDstAlloc->SurfDesc.VidPnSourceId);
             vboxWddmCheckUpdateShadowAddress(pDevExt, pSource, pPrivateData->SrcAllocInfo.segmentIdAlloc, pPrivateData->SrcAllocInfo.offAlloc);
             PVBOXWDDM_DMA_PRESENT_RENDER_FROM_SHADOW pRFS = (PVBOXWDDM_DMA_PRESENT_RENDER_FROM_SHADOW)pPrivateData;
@@ -3360 +3369 @@
             Assert (pAllocation->SegmentId);
             Assert (!pAllocation->bVisible);
-#ifndef VBOXWDDM_RENDER_FROM_SHADOW
-            if (pAllocation->bVisible)
-            {
+            Assert(pAllocation->enmType == VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE
+                    || pAllocation->enmType == VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC);
+            if (
+#ifdef VBOXWDDM_RENDER_FROM_SHADOW
+                    /* this is the case of full-screen d3d, ensure we notify host */
+                    pAllocation->enmType == VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC &&
+#endif
+                    pAllocation->bVisible)
+            {
+#ifdef VBOXWDDM_RENDER_FROM_SHADOW
+                /* to ensure the resize request gets issued in case we exit a full-screen D3D mode */
+                pSource->offVram = VBOXVIDEOOFFSET_VOID;
+#endif
                 /* should not generally happen, but still inform host*/
                 Status = vboxWddmGhDisplaySetInfo(pDevExt, pSource);
@@ -3369 +3388 @@
                     drprintf((__FUNCTION__": vboxWddmGhDisplaySetInfo failed, Status (0x%x)\n", Status));
             }
-#endif
         }
         else
@@ -3409 +3427 @@
         PVBOXWDDM_SOURCE pSource = &pDevExt->aSources[pSetVidPnSourceVisibility->VidPnSourceId];
         PVBOXWDDM_ALLOCATION pAllocation = pSource->pPrimaryAllocation;
-
+        Assert(pAllocation->enmType == VBOXWDDM_ALLOC_TYPE_STD_SHAREDPRIMARYSURFACE
+                || pAllocation->enmType == VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC);
         if (pAllocation)
         {
@@ -3416 +3435 @@
             {
                 pAllocation->bVisible = pSetVidPnSourceVisibility->Visible;
-#ifndef VBOXWDDM_RENDER_FROM_SHADOW
                 if (pAllocation->bVisible)
                 {
-                    Status = vboxWddmGhDisplaySetInfo(pDevExt, pSource);
-                    Assert(Status == STATUS_SUCCESS);
-                    if (Status != STATUS_SUCCESS)
-                        drprintf((__FUNCTION__": vboxWddmGhDisplaySetInfo failed, Status (0x%x)\n", Status));
+#ifdef VBOXWDDM_RENDER_FROM_SHADOW
+                    if (/* this is the case of full-screen d3d, ensure we notify host */
+                        pAllocation->enmType == VBOXWDDM_ALLOC_TYPE_UMD_RC_GENERIC
+                    )
+#endif
+                    {
+#ifdef VBOXWDDM_RENDER_FROM_SHADOW
+                        /* to ensure the resize request gets issued in case we exit a full-screen D3D mode */
+                        pSource->offVram = VBOXVIDEOOFFSET_VOID;
+#endif
+                        Status = vboxWddmGhDisplaySetInfo(pDevExt, pSource);
+                        Assert(Status == STATUS_SUCCESS);
+                        if (Status != STATUS_SUCCESS)
+                            drprintf((__FUNCTION__": vboxWddmGhDisplaySetInfo failed, Status (0x%x)\n", Status));
+                    }
                 }
+#ifdef VBOXVDMA
                 else
                 {
@@ -4070 +4100 @@
                                     pPrivateData->BaseHdr.enmCmd = VBOXVDMACMD_TYPE_DMA_PRESENT_SHADOW2PRIMARY;
                                     vboxWddmPopulateDmaAllocInfo(&pPrivateData->SrcAllocInfo, pSrcAlloc, pSrc);
-//                                  no need to fill dst surf info here
-//                                  vboxWddmPopulateDmaAllocInfo(&pPrivateData->DstAllocInfo, pDstAlloc, pDst);
+                                    vboxWddmPopulateDmaAllocInfo(&pPrivateData->DstAllocInfo, pDstAlloc, pDst);
                                     PVBOXWDDM_DMA_PRESENT_RENDER_FROM_SHADOW pRFS = (PVBOXWDDM_DMA_PRESENT_RENDER_FROM_SHADOW)pPrivateData;
                                     pRFS->rect = rect;