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

Timestamp:

Jun 28, 2010 9:16:59 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: visible regions bugfixes fixes

Location:

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

Files:

• VBoxVideo.h (modified) (1 diff)
• wddm/VBoxVideoCm.cpp (modified) (2 diffs)
• wddm/VBoxVideoVdma.cpp (modified) (6 diffs)
• wddm/VBoxVideoVdma.h (modified) (2 diffs)
• wddm/VBoxVideoWddm.cpp (modified) (6 diffs)
• wddm/VBoxVideoWddm.h (modified) (1 diff)

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

@@ -120 +120 @@
 #include "wddm/VBoxVideoShgsmi.h"
 #include "wddm/VBoxVideoCm.h"
+#include "wddm/VBoxVideoVdma.h"
 #include "wddm/VBoxVideoWddm.h"
-#include "wddm/VBoxVideoVdma.h"
 #include "wddm/VBoxVideoVidPn.h"
 #ifdef VBOXWDDM_WITH_VBVA

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

@@ -71 +71 @@
     cbSize = VBOXWDDM_ROUNDBOUND(cbSize, 8);
 
+    Assert(pContext->pSession);
     if (!pContext->pSession)
         return NULL;
@@ -86 +87 @@
         pCmd->CmdHdr.cbCmd = pCmd->cbMaxCmdSize;
     }
-    return pCmd;
+    return VBOXVIDEOCM_BODY(pCmd, void);
 }
 

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

@@ -149 +149 @@
         else
         {
+            KeReleaseSpinLock(&pPipe->SinchLock, OldIrql);
             Status = STATUS_INVALID_PIPE_STATE;
             break;
@@ -172 +173 @@
                 break;
         }
-        Assert(enmState > VBOXVDMAPIPE_STATE_OPENNED);
-        Status = STATUS_PIPE_CLOSING;
+        else
+        {
+            Assert(enmState == VBOXVDMAPIPE_STATE_CLOSING);
+            Status = STATUS_PIPE_CLOSING;
+            break;
+        }
     } while (1);
 
@@ -207 +212 @@
 }
 
-PVBOXVDMAPIPE_CMD_DR vboxVdmaGgCmdCreate(PVBOXVDMAGG pVdma, uint32_t cbCmd)
-{
-    return (PVBOXVDMAPIPE_CMD_DR)vboxWddmMemAllocZero(cbCmd);
+PVBOXVDMAPIPE_CMD_DR vboxVdmaGgCmdCreate(PVBOXVDMAGG pVdma, VBOXVDMAPIPE_CMD_TYPE enmType, uint32_t cbCmd)
+{
+    PVBOXVDMAPIPE_CMD_DR pHdr = (PVBOXVDMAPIPE_CMD_DR)vboxWddmMemAllocZero(cbCmd);
+    Assert(pHdr);
+    if (pHdr)
+    {
+        pHdr->enmType = enmType;
+        return pHdr;
+    }
+    return NULL;
 }
 
@@ -262 +274 @@
     PVBOXWDDM_CONTEXT pContext = pRectsInfo->pContext;
     PDEVICE_EXTENSION pDevExt = pContext->pDevice->pAdapter;
-    RECT * pContextRect = &pRectsInfo->ContextRect;
-    PVBOXWDDM_RECTS_INFO pRects = &pRectsInfo->UpdateRects;
+    RECT * pContextRect = &pRectsInfo->ContextsRects.ContextRect;
+    PVBOXWDDM_RECTS_INFO pRects = &pRectsInfo->ContextsRects.UpdateRects;
     NTSTATUS Status = STATUS_SUCCESS;
     PVBOXVIDEOCM_CMD_RECTS pCmd = NULL;
@@ -355 +367 @@
         }
     }
-    InsertHeadList(&pDevExt->ContextList3D, &pContext->ListEntry);
     ExReleaseFastMutex(&pDevExt->ContextMutex);
 
@@ -450 +461 @@
 }
 
-NTSTATUS vboxVdmaGgCmdPost(PVBOXVDMAGG pVdma, PVBOXVDMAPIPE_CMD_DR pCmd)
+NTSTATUS vboxVdmaGgCmdSubmit(PVBOXVDMAGG pVdma, PVBOXVDMAPIPE_CMD_DR pCmd)
 {
     return vboxVdmaPipeCltCmdPut(&pVdma->CmdPipe, &pCmd->PipeHdr);

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

@@ -69 +69 @@
 #define VBOXVDMAPIPE_CMD_DR_FROM_ENTRY(_pE)  ( (PVBOXVDMAPIPE_CMD_DR)VBOXVDMAPIPE_CMD_HDR_FROM_ENTRY(_pE) )
 
+typedef struct VBOXVDMAPIPE_RECTS
+{
+    RECT ContextRect;
+    VBOXWDDM_RECTS_INFO UpdateRects;
+} VBOXVDMAPIPE_RECTS, *PVBOXVDMAPIPE_RECTS;
+
 typedef struct VBOXVDMAPIPE_CMD_RECTSINFO
 {
     VBOXVDMAPIPE_CMD_DR Hdr;
-    PVBOXWDDM_CONTEXT pContext;
-    RECT ContextRect;
-    VBOXWDDM_RECTS_INFO UpdateRects;
+    struct VBOXWDDM_CONTEXT *pContext;
+    VBOXVDMAPIPE_RECTS ContextsRects;
 } VBOXVDMAPIPE_CMD_RECTSINFO, *PVBOXVDMAPIPE_CMD_RECTSINFO;
 
@@ -112 +117 @@
 #define VBOXVDMACBUF_DR_SIZE(_cbData) (VBOXVDMACBUF_DR_DATA_OFFSET() + (_cbData))
 #define VBOXVDMACBUF_DR_DATA(_pDr) ( ((uint8_t*)(_pDr)) + VBOXVDMACBUF_DR_DATA_OFFSET() )
+
+NTSTATUS vboxVdmaGgCmdSubmit(PVBOXVDMAGG pVdma, PVBOXVDMAPIPE_CMD_DR pCmd);
+PVBOXVDMAPIPE_CMD_DR vboxVdmaGgCmdCreate(PVBOXVDMAGG pVdma, VBOXVDMAPIPE_CMD_TYPE enmType, uint32_t cbCmd);
+void vboxVdmaGgCmdDestroy(PVBOXVDMAPIPE_CMD_DR pDr);
+
 #endif /* #ifndef ___VBoxVideoVdma_h___ */

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

@@ -2076 +2076 @@
             break;
         }
+#endif
         case VBOXVDMACMD_TYPE_DMA_PRESENT_BLT:
         {
@@ -2085 +2086 @@
                 {
                     RECT rect;
-                    Assert(pBlt->DstRects.cRects);
-                    if (pBlt->DstRects.cRects > 1)
+                    if (pBlt->DstRects.UpdateRects.cRects)
                     {
-                        rect = pBlt->DstRects.aRects[1];
-                        for (UINT i = 2; i < pBlt->DstRects.cRects; ++i)
+                        rect = pBlt->DstRects.UpdateRects.aRects[0];
+                        for (UINT i = 1; i < pBlt->DstRects.UpdateRects.cRects; ++i)
                         {
-                            vboxWddmRectUnited(&rect, &rect, &pBlt->DstRects.aRects[i]);
+                            vboxWddmRectUnited(&rect, &rect, &pBlt->DstRects.UpdateRects.aRects[i]);
                         }
                     }
                     else
-                        rect = pBlt->DstRects.aRects[0];
+                        rect = pBlt->DstRects.ContextRect;
 
                     VBOXWDDM_SOURCE *pSource = &pDevExt->aSources[pPrivateData->SrcAllocInfo.srcId];
                     VBOXVBVA_OP(ReportDirtyRect, pDevExt, &pSource->Vbva, &rect);
+                }
+
+                PVBOXWDDM_CONTEXT pContext = (PVBOXWDDM_CONTEXT)pSubmitCommand->hContext;
+                Assert(pContext);
+                Assert(pContext->pDevice);
+                Assert(pContext->pDevice->pAdapter == pDevExt);
+                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]));
+                Assert(pRectsCmd);
+                if (pRectsCmd)
+                {
+                    pRectsCmd->pContext = pContext;
+                    pRectsCmd->ContextsRects = pBlt->DstRects;
+                    NTSTATUS tmpStatus = vboxVdmaGgCmdSubmit(&pDevExt->u.primary.Vdma.DmaGg, &pRectsCmd->Hdr);
+                    Assert(tmpStatus == STATUS_SUCCESS);
+                    if (tmpStatus != STATUS_SUCCESS)
+                        vboxVdmaGgCmdDestroy(&pRectsCmd->Hdr);
                 }
             }
@@ -2116 +2132 @@
             break;
         }
-
-#endif
         default:
         {
@@ -3756 +3770 @@
                     PVBOXWDDM_DMA_PRESENT_BLT pBlt = (PVBOXWDDM_DMA_PRESENT_BLT)pPrivateData;
                     pBlt->SrcRect = pPresent->SrcRect;
-                    pBlt->DstRects.cRects = 1;
-                    pBlt->DstRects.aRects[0] = pPresent->DstRect;
-                    UINT cbHead = RT_OFFSETOF(VBOXWDDM_DMA_PRESENT_BLT, DstRects.aRects[1]);
+                    pBlt->DstRects.ContextRect = pPresent->DstRect;
+                    pBlt->DstRects.UpdateRects.cRects = 0;
+                    UINT cbHead = RT_OFFSETOF(VBOXWDDM_DMA_PRESENT_BLT, DstRects.UpdateRects.aRects[0]);
                     Assert(pPresent->SubRectCnt > pPresent->MultipassOffset);
                     UINT cbRects = (pPresent->SubRectCnt - pPresent->MultipassOffset) * sizeof (RECT);
@@ -3768 +3782 @@
                     {
                         cbCmd -= cbRects;
-                        memcpy(&pBlt->DstRects.aRects[pPresent->MultipassOffset + 1], pPresent->pDstSubRects, cbRects);
-                        pBlt->DstRects.cRects += cbRects/sizeof (RECT);
+                        memcpy(&pBlt->DstRects.UpdateRects.aRects[pPresent->MultipassOffset], pPresent->pDstSubRects, cbRects);
+                        pBlt->DstRects.UpdateRects.cRects += cbRects/sizeof (RECT);
                     }
                     else
@@ -3775 +3789 @@
                         UINT cbFitingRects = (cbCmd/sizeof (RECT)) * sizeof (RECT);
                         Assert(cbFitingRects);
-                        memcpy(&pBlt->DstRects.aRects[pPresent->MultipassOffset + 1], pPresent->pDstSubRects, cbFitingRects);
+                        memcpy(&pBlt->DstRects.UpdateRects.aRects[pPresent->MultipassOffset], pPresent->pDstSubRects, cbFitingRects);
                         cbCmd -= cbFitingRects;
                         pPresent->MultipassOffset += cbFitingRects/sizeof (RECT);
-                        pBlt->DstRects.cRects += cbFitingRects/sizeof (RECT);
+                        pBlt->DstRects.UpdateRects.cRects += cbFitingRects/sizeof (RECT);
                         Assert(pPresent->SubRectCnt > pPresent->MultipassOffset);
                         Status = STATUS_GRAPHICS_INSUFFICIENT_DMA_BUFFER;

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

@@ -180 +180 @@
     VBOXWDDM_DMA_PRIVATEDATA_HDR Hdr;
     RECT SrcRect;
-    VBOXWDDM_RECTS_INFO DstRects;
+    VBOXVDMAPIPE_RECTS DstRects;
 }VBOXWDDM_DMA_PRESENT_BLT, *PVBOXWDDM_DMA_PRESENT_BLT;