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

Timestamp:

Nov 24, 2010 10:06:02 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: propper hide host window on swapchain destruction

Location:

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

Files:

• VBoxVideoIf.h (modified) (3 diffs)
• VBoxVideoMisc.cpp (modified) (2 diffs)
• VBoxVideoVdma.cpp (modified) (2 diffs)
• VBoxVideoVdma.h (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoIf.h

@@ -30 +30 @@
 
 /* One would increase this whenever definitions in this file are changed */
-#define VBOXVIDEOIF_VERSION 7
+#define VBOXVIDEOIF_VERSION 8
 
 /* create allocation func */
@@ -214 +214 @@
     VBOXWDDM_CONTEXT_TYPE_CUSTOM_2D,
     VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_3D,
-    VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL
+    VBOXWDDM_CONTEXT_TYPE_CUSTOM_UHGSMI_GL,
+    VBOXWDDM_CONTEXT_TYPE_CUSTOM_SESSION
 } VBOXWDDM_CONTEXT_TYPE;
 
@@ -246 +247 @@
             /* adds hidden regions */
             UINT bAddHiddenRects : 1;
-            UINT Reserved : 29;
+            /* hide entire window */
+            UINT bHide : 1;
+            /* reserved */
+            UINT Reserved : 28;
         };
         uint32_t Value;

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

@@ -204 +204 @@
     Assert(cRefs < UINT32_MAX/2);
     if (!cRefs)
+    {
+        Assert(pSwapchain->pContext);
+        if (pSwapchain->pContext)
+        {
+            NTSTATUS tmpStatus = vboxVdmaPostHideSwapchain(pSwapchain);
+            Assert(tmpStatus == STATUS_SUCCESS);
+        }
         vboxWddmMemFree(pSwapchain);
+    }
 }
 
@@ -313 +321 @@
     Assert(pTst == pSwapchain);
     RemoveEntryList(&pSwapchain->DevExtListEntry);
-    pSwapchain->pContext = NULL;
+//    pSwapchain->pContext = NULL;
     pSwapchain->hSwapchainKm = NULL;
     if (pSwapchain->pLastReportedRects)

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

@@ -305 +305 @@
     }
     return true;
+}
+
+NTSTATUS vboxVdmaPostHideSwapchain(PVBOXWDDM_SWAPCHAIN pSwapchain)
+{
+    Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
+    uint32_t cbCmdInternal = VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE4CRECTS(0);
+    PVBOXVIDEOCM_CMD_RECTS_INTERNAL pCmdInternal =
+            (PVBOXVIDEOCM_CMD_RECTS_INTERNAL)vboxVideoCmCmdCreate(&pSwapchain->pContext->CmContext, cbCmdInternal);
+    Assert(pCmdInternal);
+    if (pCmdInternal)
+    {
+        pCmdInternal->hSwapchainUm = pSwapchain->hSwapchainUm;
+        pCmdInternal->Cmd.fFlags.Value = 0;
+        pCmdInternal->Cmd.fFlags.bAddHiddenRects = 1;
+        pCmdInternal->Cmd.fFlags.bHide = 1;
+        pCmdInternal->Cmd.RectsInfo.cRects = 0;
+        vboxVideoCmCmdSubmit(pCmdInternal, VBOXVIDEOCM_SUBMITSIZE_DEFAULT);
+        return STATUS_SUCCESS;
+    }
+    return STATUS_NO_MEMORY;
 }
 
@@ -914 +934 @@
                             Assert(Status == STATUS_SUCCESS);
                         } break;
+                        case VBOXVDMAPIPE_CMD_TYPE_RECTSINFO:
+                        {
+                            PVBOXVDMAPIPE_CMD_RECTSINFO pRects = (PVBOXVDMAPIPE_CMD_RECTSINFO)pDr;
+                            Status = vboxVdmaGgDirtyRectsProcess(pRects->pDevExt, pRects->pContext, pRects->pSwapchain, &pRects->ContextsRects);
+                            Assert(Status == STATUS_SUCCESS);
+                            vboxVdmaGgCmdDestroy(pDr);
+                            break;
+                        }
                         default:
                             AssertBreakpoint();

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoVdma.h

@@ -178 +178 @@
 {
     VBOXVDMAPIPE_CMD_DR Hdr;
-    VBOXVDMADDI_CMD DdiCmd;
+    PDEVICE_EXTENSION pDevExt;
+    PVBOXWDDM_CONTEXT pContext;
     struct VBOXWDDM_SWAPCHAIN *pSwapchain;
     VBOXVDMAPIPE_RECTS ContextsRects;
@@ -302 +303 @@
 void vboxVdmaGgCmdDestroy(PVBOXVDMAPIPE_CMD_DR pDr);
 
+NTSTATUS vboxVdmaPostHideSwapchain(PVBOXWDDM_SWAPCHAIN pSwapchain);
+
 #define VBOXVDMAPIPE_CMD_DR_FROM_DDI_CMD(_pCmd) ((PVBOXVDMAPIPE_CMD_DR)(((uint8_t*)(_pCmd)) - RT_OFFSETOF(VBOXVDMAPIPE_CMD_DR, DdiCmd)))
 DECLCALLBACK(VOID) vboxVdmaGgDdiCmdDestroy(PDEVICE_EXTENSION pDevExt, PVBOXVDMADDI_CMD pCmd, PVOID pvContext);