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

Timestamp:

Aug 19, 2010 5:03:40 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: multimonitor for fullscreen apps (Aero), shared rc support needed

Location:

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

Files:

• VBoxVideoIf.h (modified) (2 diffs)
• VBoxVideoVdma.cpp (modified) (10 diffs)
• VBoxVideoVdma.h (modified) (1 diff)
• VBoxVideoWddm.cpp (modified) (5 diffs)
• VBoxVideoWddm.h (modified) (1 diff)

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

@@ -28 +28 @@
 
 
-/* @todo: implement a check to ensure display & miniport versions match.
- * One would increase this whenever definitions in this file are changed */
-#define VBOXVIDEOIF_VERSION 4
+/* One would increase this whenever definitions in this file are changed */
+#define VBOXVIDEOIF_VERSION 5
 
 /* create allocation func */
@@ -213 +212 @@
 } VBOXVIDEOCM_CMD_RECTS, *PVBOXVIDEOCM_CMD_RECTS;
 
-#define VBOXVIDEOCM_CMD_RECTS_SIZE4CRECTS(_cRects) (RT_OFFSETOF(VBOXVIDEOCM_CMD_RECTS, RectsInfo.aRects[(_cRects)]))
-#define VBOXVIDEOCM_CMD_RECTS_SIZE(_pCmd) (VBOXVIDEOCM_CMD_RECTS_SIZE4CRECTS((_pCmd)->cRects))
+typedef struct VBOXVIDEOCM_CMD_RECTS_INTERNAL
+{
+    D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId;
+    UINT u32Reserved;
+    VBOXVIDEOCM_CMD_RECTS Cmd;
+} VBOXVIDEOCM_CMD_RECTS_INTERNAL, *PVBOXVIDEOCM_CMD_RECTS_INTERNAL;
+
+#define VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE4CRECTS(_cRects) (RT_OFFSETOF(VBOXVIDEOCM_CMD_RECTS_INTERNAL, Cmd.RectsInfo.aRects[(_cRects)]))
+#define VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE(_pCmd) (VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE4CRECTS((_pCmd)->cRects))
 
 typedef struct VBOXWDDM_GETVBOXVIDEOCMCMD_HDR

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

@@ -310 +310 @@
     PVBOXWDDM_RECTS_INFO pRects = &pRectsInfo->ContextsRects.UpdateRects;
     NTSTATUS Status = STATUS_SUCCESS;
-    PVBOXVIDEOCM_CMD_RECTS pCmd = NULL;
-    uint32_t cbCmd = VBOXVIDEOCM_CMD_RECTS_SIZE4CRECTS(pRects->cRects);
+    PVBOXVIDEOCM_CMD_RECTS_INTERNAL pCmdInternal = NULL;
+    uint32_t cbCmdInternal = VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE4CRECTS(pRects->cRects);
     Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
     ExAcquireFastMutex(&pDevExt->ContextMutex);
@@ -319 +319 @@
         {
             PVBOXWDDM_CONTEXT pCurContext = VBOXWDDMENTRY_2_CONTEXT(pCur);
-            if (!pCmd)
-            {
-                pCmd = (PVBOXVIDEOCM_CMD_RECTS)vboxVideoCmCmdCreate(&pCurContext->CmContext, cbCmd);
-                Assert(pCmd);
-                if (!pCmd)
+            if (!pCmdInternal)
+            {
+                pCmdInternal = (PVBOXVIDEOCM_CMD_RECTS_INTERNAL)vboxVideoCmCmdCreate(&pCurContext->CmContext, cbCmdInternal);
+                Assert(pCmdInternal);
+                if (!pCmdInternal)
                 {
                     Status = STATUS_NO_MEMORY;
@@ -331 +331 @@
             else
             {
-                pCmd = (PVBOXVIDEOCM_CMD_RECTS)vboxVideoCmCmdReinitForContext(pCmd, &pCurContext->CmContext);
+                pCmdInternal = (PVBOXVIDEOCM_CMD_RECTS_INTERNAL)vboxVideoCmCmdReinitForContext(pCmdInternal, &pCurContext->CmContext);
             }
 
-            vboxVdmaDirtyRectsCalcIntersection(&pCurContext->ViewRect, pRects, &pCmd->RectsInfo);
-            if (pCmd->RectsInfo.cRects)
+            vboxVdmaDirtyRectsCalcIntersection(&pCurContext->ViewRect, pRects, &pCmdInternal->Cmd.RectsInfo);
+            if (pCmdInternal->Cmd.RectsInfo.cRects)
             {
                 bool bSend = false;
-                pCmd->fFlags.Value = 0;
-                pCmd->fFlags.bAddHiddenRects = 1;
+                pCmdInternal->Cmd.fFlags.Value = 0;
+                pCmdInternal->Cmd.fFlags.bAddHiddenRects = 1;
                 if (pCurContext->pLastReportedRects)
                 {
-                    if (pCurContext->pLastReportedRects->fFlags.bSetVisibleRects)
+                    if (pCurContext->pLastReportedRects->Cmd.fFlags.bSetVisibleRects)
                     {
                         RECT *paPrevRects;
                         uint32_t cPrevRects;
-                        if (pCurContext->pLastReportedRects->fFlags.bSetViewRect)
+                        if (pCurContext->pLastReportedRects->Cmd.fFlags.bSetViewRect)
                         {
-                            paPrevRects = &pCurContext->pLastReportedRects->RectsInfo.aRects[1];
-                            cPrevRects = pCurContext->pLastReportedRects->RectsInfo.cRects - 1;
+                            paPrevRects = &pCurContext->pLastReportedRects->Cmd.RectsInfo.aRects[1];
+                            cPrevRects = pCurContext->pLastReportedRects->Cmd.RectsInfo.cRects - 1;
                         }
                         else
                         {
-                            paPrevRects = &pCurContext->pLastReportedRects->RectsInfo.aRects[0];
-                            cPrevRects = pCurContext->pLastReportedRects->RectsInfo.cRects;
+                            paPrevRects = &pCurContext->pLastReportedRects->Cmd.RectsInfo.aRects[0];
+                            cPrevRects = pCurContext->pLastReportedRects->Cmd.RectsInfo.cRects;
                         }
 
-                        if (vboxVdmaDirtyRectsHasIntersections(paPrevRects, cPrevRects, pCmd->RectsInfo.aRects, pCmd->RectsInfo.cRects))
+                        if (vboxVdmaDirtyRectsHasIntersections(paPrevRects, cPrevRects,
+                                pCmdInternal->Cmd.RectsInfo.aRects, pCmdInternal->Cmd.RectsInfo.cRects))
                         {
                             bSend = true;
@@ -364 +365 @@
                     else
                     {
-                        Assert(pCurContext->pLastReportedRects->fFlags.bAddHiddenRects);
-                        if (!vboxVdmaDirtyRectsIsCover(pCurContext->pLastReportedRects->RectsInfo.aRects,
-                                pCurContext->pLastReportedRects->RectsInfo.cRects,
-                                pCmd->RectsInfo.aRects, pCmd->RectsInfo.cRects))
+                        Assert(pCurContext->pLastReportedRects->Cmd.fFlags.bAddHiddenRects);
+                        if (!vboxVdmaDirtyRectsIsCover(pCurContext->pLastReportedRects->Cmd.RectsInfo.aRects,
+                                pCurContext->pLastReportedRects->Cmd.RectsInfo.cRects,
+                                pCmdInternal->Cmd.RectsInfo.aRects, pCmdInternal->Cmd.RectsInfo.cRects))
                         {
                             bSend = true;
@@ -380 +381 @@
                     if (pCurContext->pLastReportedRects)
                         vboxVideoCmCmdRelease(pCurContext->pLastReportedRects);
-                    vboxVideoCmCmdRetain(pCmd);
-                    pCurContext->pLastReportedRects = pCmd;
-                    vboxVideoCmCmdSubmit(pCmd, VBOXVIDEOCM_CMD_RECTS_SIZE4CRECTS(pCmd->RectsInfo.cRects));
-                    pCmd = NULL;
+
+                    pCmdInternal->VidPnSourceId = pRectsInfo->VidPnSourceId;
+
+                    vboxVideoCmCmdRetain(pCmdInternal);
+                    pCurContext->pLastReportedRects = pCmdInternal;
+                    vboxVideoCmCmdSubmit(pCmdInternal, VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE4CRECTS(pCmdInternal->Cmd.RectsInfo.cRects));
+                    pCmdInternal = NULL;
                 }
             }
@@ -394 +398 @@
                     || pContext->ViewRect.right != pContextRect->right
                     || pContext->ViewRect.bottom != pContextRect->bottom);
-            PVBOXVIDEOCM_CMD_RECTS pDrCmd;
+            PVBOXVIDEOCM_CMD_RECTS_INTERNAL pDrCmdInternal;
 
             bool bSend = false;
@@ -400 +404 @@
             if (bRectShanged)
             {
-                uint32_t cbDrCmd = VBOXVIDEOCM_CMD_RECTS_SIZE4CRECTS(pRects->cRects + 1);
-                pDrCmd = (PVBOXVIDEOCM_CMD_RECTS)vboxVideoCmCmdCreate(&pContext->CmContext, cbDrCmd);
-                Assert(pDrCmd);
-                if (!pDrCmd)
+                uint32_t cbDrCmdInternal = VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE4CRECTS(pRects->cRects + 1);
+                pDrCmdInternal = (PVBOXVIDEOCM_CMD_RECTS_INTERNAL)vboxVideoCmCmdCreate(&pContext->CmContext, cbDrCmdInternal);
+                Assert(pDrCmdInternal);
+                if (!pDrCmdInternal)
                 {
                     Status = STATUS_NO_MEMORY;
                     break;
                 }
-                pDrCmd->fFlags.Value = 0;
-                pDrCmd->RectsInfo.cRects = pRects->cRects + 1;
-                pDrCmd->fFlags.bSetViewRect = 1;
-                pDrCmd->RectsInfo.aRects[0] = *pContextRect;
+                pDrCmdInternal->Cmd.fFlags.Value = 0;
+                pDrCmdInternal->Cmd.RectsInfo.cRects = pRects->cRects + 1;
+                pDrCmdInternal->Cmd.fFlags.bSetViewRect = 1;
+                pDrCmdInternal->Cmd.RectsInfo.aRects[0] = *pContextRect;
                 pContext->ViewRect = *pContextRect;
-                memcpy(&pDrCmd->RectsInfo.aRects[1], pRects->aRects, sizeof (RECT) * pRects->cRects);
+                memcpy(&pDrCmdInternal->Cmd.RectsInfo.aRects[1], pRects->aRects, sizeof (RECT) * pRects->cRects);
                 bSend = true;
             }
             else
             {
-                if (pCmd)
-                {
-                    pDrCmd = (PVBOXVIDEOCM_CMD_RECTS)vboxVideoCmCmdReinitForContext(pCmd, &pContext->CmContext);
-                    pCmd = NULL;
+                if (pCmdInternal)
+                {
+                    pDrCmdInternal = (PVBOXVIDEOCM_CMD_RECTS_INTERNAL)vboxVideoCmCmdReinitForContext(pCmdInternal, &pContext->CmContext);
+                    pCmdInternal = NULL;
                 }
                 else
                 {
-                    pDrCmd = (PVBOXVIDEOCM_CMD_RECTS)vboxVideoCmCmdCreate(&pContext->CmContext, cbCmd);
-                    Assert(pDrCmd);
-                    if (!pDrCmd)
+                    pDrCmdInternal = (PVBOXVIDEOCM_CMD_RECTS_INTERNAL)vboxVideoCmCmdCreate(&pContext->CmContext, cbCmdInternal);
+                    Assert(pDrCmdInternal);
+                    if (!pDrCmdInternal)
                     {
                         Status = STATUS_NO_MEMORY;
@@ -433 +437 @@
                     }
                 }
-                pDrCmd->fFlags.Value = 0;
-                pDrCmd->RectsInfo.cRects = pRects->cRects;
-                memcpy(&pDrCmd->RectsInfo.aRects[0], pRects->aRects, sizeof (RECT) * pRects->cRects);
+                pDrCmdInternal->Cmd.fFlags.Value = 0;
+                pDrCmdInternal->Cmd.RectsInfo.cRects = pRects->cRects;
+                memcpy(&pDrCmdInternal->Cmd.RectsInfo.aRects[0], pRects->aRects, sizeof (RECT) * pRects->cRects);
 
                 if (pContext->pLastReportedRects)
                 {
-                    if (pContext->pLastReportedRects->fFlags.bSetVisibleRects)
+                    if (pContext->pLastReportedRects->Cmd.fFlags.bSetVisibleRects)
                     {
                         RECT *paRects;
                         uint32_t cRects;
-                        if (pContext->pLastReportedRects->fFlags.bSetViewRect)
+                        if (pContext->pLastReportedRects->Cmd.fFlags.bSetViewRect)
                         {
-                            paRects = &pContext->pLastReportedRects->RectsInfo.aRects[1];
-                            cRects = pContext->pLastReportedRects->RectsInfo.cRects - 1;
+                            paRects = &pContext->pLastReportedRects->Cmd.RectsInfo.aRects[1];
+                            cRects = pContext->pLastReportedRects->Cmd.RectsInfo.cRects - 1;
                         }
                         else
                         {
-                            paRects = &pContext->pLastReportedRects->RectsInfo.aRects[0];
-                            cRects = pContext->pLastReportedRects->RectsInfo.cRects;
+                            paRects = &pContext->pLastReportedRects->Cmd.RectsInfo.aRects[0];
+                            cRects = pContext->pLastReportedRects->Cmd.RectsInfo.cRects;
                         }
-                        bSend = (pDrCmd->RectsInfo.cRects != cRects)
-                                || memcmp(paRects, pDrCmd->RectsInfo.aRects, cRects * sizeof (RECT));
+                        bSend = (pDrCmdInternal->Cmd.RectsInfo.cRects != cRects)
+                                || memcmp(paRects, pDrCmdInternal->Cmd.RectsInfo.aRects, cRects * sizeof (RECT));
                     }
                     else
                     {
-                        Assert(pContext->pLastReportedRects->fFlags.bAddHiddenRects);
+                        Assert(pContext->pLastReportedRects->Cmd.fFlags.bAddHiddenRects);
                         bSend = true;
                     }
@@ -473 +477 @@
                     vboxVideoCmCmdRelease(pContext->pLastReportedRects);
 
-                pDrCmd->fFlags.bSetVisibleRects = 1;
-
-                vboxVideoCmCmdRetain(pDrCmd);
-                pContext->pLastReportedRects = pDrCmd;
-                vboxVideoCmCmdSubmit(pDrCmd, VBOXVIDEOCM_SUBMITSIZE_DEFAULT);
+                pDrCmdInternal->Cmd.fFlags.bSetVisibleRects = 1;
+                pDrCmdInternal->VidPnSourceId = pRectsInfo->VidPnSourceId;
+
+                vboxVideoCmCmdRetain(pDrCmdInternal);
+                pContext->pLastReportedRects = pDrCmdInternal;
+                vboxVideoCmCmdSubmit(pDrCmdInternal, VBOXVIDEOCM_SUBMITSIZE_DEFAULT);
             }
             else
             {
-                if (!pCmd)
-                    pCmd = pDrCmd;
+                if (!pCmdInternal)
+                    pCmdInternal = pDrCmdInternal;
                 else
-                    vboxVideoCmCmdRelease(pDrCmd);
+                    vboxVideoCmCmdRelease(pDrCmdInternal);
             }
         }
@@ -491 +496 @@
 
 
-    if (pCmd)
-        vboxVideoCmCmdRelease(pCmd);
+    if (pCmdInternal)
+        vboxVideoCmCmdRelease(pCmdInternal);
 
     return Status;

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

@@ -79 +79 @@
     VBOXVDMAPIPE_CMD_DR Hdr;
     struct VBOXWDDM_CONTEXT *pContext;
+    D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId;
     VBOXVDMAPIPE_RECTS ContextsRects;
 } VBOXVDMAPIPE_CMD_RECTSINFO, *PVBOXVDMAPIPE_CMD_RECTSINFO;

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

@@ -2066 +2066 @@
 }
 
-static void vboxWddmSubmitBltCmd(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_SOURCE pSource, PVBOXWDDM_CONTEXT pContext, PVBOXWDDM_DMA_PRESENT_BLT pBlt)
+static void vboxWddmSubmitBltCmd(PDEVICE_EXTENSION pDevExt, PVBOXWDDM_DMA_PRESENT_BLT pBlt)
 {
     PVBOXVDMAPIPE_CMD_RECTSINFO pRectsCmd = (PVBOXVDMAPIPE_CMD_RECTSINFO)vboxVdmaGgCmdCreate(&pDevExt->u.primary.Vdma.DmaGg, VBOXVDMAPIPE_CMD_TYPE_RECTSINFO, RT_OFFSETOF(VBOXVDMAPIPE_CMD_RECTSINFO, ContextsRects.UpdateRects.aRects[pBlt->DstRects.UpdateRects.cRects]));
@@ -2072 +2072 @@
     if (pRectsCmd)
     {
+        VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pBlt->Hdr.DstAllocInfo.srcId];
+        VBOXWDDM_CONTEXT *pContext = pBlt->Hdr.pContext;
         pRectsCmd->pContext = pContext;
+        pRectsCmd->VidPnSourceId = pBlt->Hdr.SrcAllocInfo.srcId;
         memcpy(&pRectsCmd->ContextsRects, &pBlt->DstRects, RT_OFFSETOF(VBOXVDMAPIPE_RECTS, UpdateRects.aRects[pBlt->DstRects.UpdateRects.cRects]));
         vboxWddmRectTranslate(&pRectsCmd->ContextsRects.ContextRect, pSource->VScreenPos.x, pSource->VScreenPos.y);
@@ -2184 +2187 @@
                                     VBOXVBVA_OP_WITHLOCK_ATDPC(ReportDirtyRect, pDevExt, pSource, &rect);
                                 }
-                                vboxWddmSubmitBltCmd(pDevExt, pSource, pContext, pBlt);
+                                vboxWddmSubmitBltCmd(pDevExt, pBlt);
                                 break;
                             }
@@ -2193 +2196 @@
                                 if (pSrcAlloc->fRcFlags.RenderTarget)
                                 {
-                                    vboxWddmSubmitBltCmd(pDevExt, pSource, pContext, pBlt);
+                                    vboxWddmSubmitBltCmd(pDevExt, pBlt);
                                 }
                                 break;
@@ -2237 +2240 @@
                 VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pPrivateData->SrcAllocInfo.srcId];
                 pRectsCmd->pContext = pContext;
+                pRectsCmd->VidPnSourceId = pPrivateData->SrcAllocInfo.srcId;
                 RECT r;
                 r.left = pSource->VScreenPos.x;

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

@@ -132 +132 @@
     UINT uLastCompletedCmdFenceId;
     RECT ViewRect;
-    PVBOXVIDEOCM_CMD_RECTS pLastReportedRects;
+    PVBOXVIDEOCM_CMD_RECTS_INTERNAL pLastReportedRects;
     VBOXVIDEOCM_CTX CmContext;
 } VBOXWDDM_CONTEXT, *PVBOXWDDM_CONTEXT;