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

Timestamp:

Jun 30, 2010 3:55:53 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: visible region tracking fixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispCm.cpp (modified) (4 diffs)
• Display/wddm/VBoxDispMp.cpp (modified) (1 diff)
• Miniport/wddm/VBoxVideoVdma.cpp (modified) (10 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispCm.cpp

@@ -160 +160 @@
 }
 
+static HRESULT vboxDispCmSessionCmdQueryData(PVBOXDISPCM_SESSION pSession, PVBOXDISPIFESCAPE_GETVBOXVIDEOCMCMD pCmd, uint32_t cbCmd)
+{
+
+    HRESULT hr = S_OK;
+    D3DDDICB_ESCAPE DdiEscape;
+    DdiEscape.Flags.Value = 0;
+    DdiEscape.pPrivateDriverData = pCmd;
+    DdiEscape.PrivateDriverDataSize = cbCmd;
+
+    pCmd->EscapeHdr.escapeCode = VBOXESC_GETVBOXVIDEOCMCMD;
+    /* lock to ensure the context is not distructed */
+    EnterCriticalSection(&pSession->CritSect);
+    /* use any context for identifying the kernel CmSession. We're using the first one */
+    PVBOXWDDMDISP_CONTEXT pContext = RTListNodeGetFirst(&pSession->CtxList, VBOXWDDMDISP_CONTEXT, ListNode);
+    if (pContext)
+    {
+        PVBOXWDDMDISP_DEVICE pDevice = pContext->pDevice;
+        DdiEscape.hDevice = pDevice->hDevice;
+        DdiEscape.hContext = pContext->ContextInfo.hContext;
+        Assert (DdiEscape.hContext);
+        Assert (DdiEscape.hDevice);
+        hr = pDevice->RtCallbacks.pfnEscapeCb(pDevice->pAdapter->hAdapter, &DdiEscape);
+        LeaveCriticalSection(&pSession->CritSect);
+        Assert(hr == S_OK);
+        if (hr == S_OK)
+        {
+            if (!pCmd->Hdr.cbCmdsReturned && !pCmd->Hdr.cbRemainingFirstCmd)
+                hr = S_FALSE;
+        }
+    }
+    else
+    {
+        LeaveCriticalSection(&pSession->CritSect);
+        hr = S_FALSE;
+    }
+
+    return hr;
+}
+
 HRESULT vboxDispCmSessionCmdGet(PVBOXDISPCM_SESSION pSession, PVBOXDISPIFESCAPE_GETVBOXVIDEOCMCMD pCmd, uint32_t cbCmd, DWORD dwMilliseconds)
 {
@@ -168 +207 @@
     do
     {
+        HRESULT hr = vboxDispCmSessionCmdQueryData(pSession, pCmd, cbCmd);
+        Assert(hr == S_OK || hr == S_FALSE);
+        if (hr == S_OK || hr != S_FALSE)
+            return hr;
+
         DWORD dwResult = WaitForSingleObject(pSession->hEvent, dwMilliseconds);
         switch(dwResult)
@@ -173 +217 @@
             case WAIT_OBJECT_0:
             {
-                HRESULT hr = S_OK;
-                D3DDDICB_ESCAPE DdiEscape;
-                DdiEscape.Flags.Value = 0;
-                DdiEscape.pPrivateDriverData = pCmd;
-                DdiEscape.PrivateDriverDataSize = cbCmd;
-
-                pCmd->EscapeHdr.escapeCode = VBOXESC_GETVBOXVIDEOCMCMD;
-                /* lock to ensure the context is not distructed */
-                EnterCriticalSection(&pSession->CritSect);
-                /* use any context for identifying the kernel CmSession. We're using the first one */
-                PVBOXWDDMDISP_CONTEXT pContext = RTListNodeGetFirst(&pSession->CtxList, VBOXWDDMDISP_CONTEXT, ListNode);
-                if (pContext)
-                {
-                    PVBOXWDDMDISP_DEVICE pDevice = pContext->pDevice;
-                    DdiEscape.hDevice = pDevice->hDevice;
-                    DdiEscape.hContext = pContext->ContextInfo.hContext;
-                    Assert (DdiEscape.hContext);
-                    Assert (DdiEscape.hDevice);
-                    hr = pDevice->RtCallbacks.pfnEscapeCb(pDevice->pAdapter->hAdapter, &DdiEscape);
-                    LeaveCriticalSection(&pSession->CritSect);
-                    Assert(hr == S_OK);
-                    if (hr == S_OK)
-                    {
-                        if (!pCmd->Hdr.cbCmdsReturned && !pCmd->Hdr.cbRemainingFirstCmd)
-                            break; /* <- break to enter a new wait cycle */
-                    }
-                }
-                else
-                {
-                    LeaveCriticalSection(&pSession->CritSect);
-                    pCmd->Hdr.cbCmdsReturned = 0;
-                    pCmd->Hdr.cbRemainingCmds = 0;
-                    pCmd->Hdr.cbRemainingFirstCmd = 0;
-                }
-
-                return hr;
+                break; /* <- query commands */
             }
             case WAIT_TIMEOUT:
             {
-                pCmd->Hdr.cbCmdsReturned = 0;
-                pCmd->Hdr.cbRemainingCmds = 0;
-                pCmd->Hdr.cbRemainingFirstCmd = 0;
                 return WAIT_TIMEOUT;
             }
@@ -222 +228 @@
         }
     } while (1);
+
+    /* should never be here */
+    AssertBreakpoint();
+    return E_FAIL;
 }
 

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispMp.cpp

@@ -96 +96 @@
         {
             hr =  vboxDispCmCmdGet(g_VBoxDispMp.pEscapeCmd, g_VBoxDispMp.cbEscapeCmd, dwMilliseconds);
-            Assert(hr == S_OK);
+            Assert(hr == S_OK || (dwMilliseconds != INFINITE && hr == WAIT_TIMEOUT));
             if (hr == S_OK)
             {

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

@@ -309 +309 @@
     PVBOXWDDM_CONTEXT pContext = pRectsInfo->pContext;
     PDEVICE_EXTENSION pDevExt = pContext->pDevice->pAdapter;
-    RECT * pContextRect = &pRectsInfo->ContextsRects.ContextRect;
     PVBOXWDDM_RECTS_INFO pRects = &pRectsInfo->ContextsRects.UpdateRects;
     NTSTATUS Status = STATUS_SUCCESS;
@@ -342 +341 @@
                 Assert(pCmd->fFlags.Value == 0);
                 pCmd->fFlags.bAddHiddenRects = 1;
-                if (pContext->pLastReportedRects)
+                if (pCurContext->pLastReportedRects)
                 {
-                    if (pContext->pLastReportedRects->fFlags.bSetVisibleRects)
+                    if (pCurContext->pLastReportedRects->fFlags.bSetVisibleRects)
                     {
                         RECT *paPrevRects;
                         uint32_t cPrevRects;
-                        if (pContext->pLastReportedRects->fFlags.bSetViewRect)
+                        if (pCurContext->pLastReportedRects->fFlags.bSetViewRect)
                         {
-                            paPrevRects = &pContext->pLastReportedRects->RectsInfo.aRects[1];
-                            cPrevRects = pContext->pLastReportedRects->RectsInfo.cRects - 1;
+                            paPrevRects = &pCurContext->pLastReportedRects->RectsInfo.aRects[1];
+                            cPrevRects = pCurContext->pLastReportedRects->RectsInfo.cRects - 1;
                         }
                         else
                         {
-                            paPrevRects = &pContext->pLastReportedRects->RectsInfo.aRects[0];
-                            cPrevRects = pContext->pLastReportedRects->RectsInfo.cRects;
+                            paPrevRects = &pCurContext->pLastReportedRects->RectsInfo.aRects[0];
+                            cPrevRects = pCurContext->pLastReportedRects->RectsInfo.cRects;
                         }
 
@@ -366 +365 @@
                     else
                     {
-                        Assert(pContext->pLastReportedRects->fFlags.bAddHiddenRects);
-                        if (!vboxVdmaDirtyRectsIsCover(pContext->pLastReportedRects->RectsInfo.aRects,
-                                pContext->pLastReportedRects->RectsInfo.cRects,
+                        Assert(pCurContext->pLastReportedRects->fFlags.bAddHiddenRects);
+                        if (!vboxVdmaDirtyRectsIsCover(pCurContext->pLastReportedRects->RectsInfo.aRects,
+                                pCurContext->pLastReportedRects->RectsInfo.cRects,
                                 pCmd->RectsInfo.aRects, pCmd->RectsInfo.cRects))
                         {
@@ -380 +379 @@
                 if (bSend)
                 {
-                    if (pContext->pLastReportedRects)
-                        vboxVideoCmCmdRelease(pContext->pLastReportedRects);
+                    if (pCurContext->pLastReportedRects)
+                        vboxVideoCmCmdRelease(pCurContext->pLastReportedRects);
                     vboxVideoCmCmdRetain(pCmd);
-                    pContext->pLastReportedRects = pCmd;
+                    pCurContext->pLastReportedRects = pCmd;
                     vboxVideoCmCmdSubmit(pCmd, VBOXVIDEOCM_CMD_RECTS_SIZE4CRECTS(pCmd->RectsInfo.cRects));
                     pCmd = NULL;
@@ -391 +390 @@
         else
         {
+            RECT * pContextRect = &pRectsInfo->ContextsRects.ContextRect;
             bool bRectShanged = (pContext->ViewRect.left != pContextRect->left
                     || pContext->ViewRect.top != pContextRect->top
@@ -396 +396 @@
                     || pContext->ViewRect.bottom != pContextRect->bottom);
             PVBOXVIDEOCM_CMD_RECTS pDrCmd;
+
+            bool bSend = false;
 
             if (bRectShanged)
@@ -407 +409 @@
                     break;
                 }
+                pDrCmd->fFlags.Value = 0;
                 pDrCmd->RectsInfo.cRects = pRects->cRects + 1;
+                pDrCmd->fFlags.bSetViewRect = 1;
+                pDrCmd->RectsInfo.aRects[0] = *pContextRect;
+                pContext->ViewRect = *pContextRect;
+                memcpy(&pDrCmd->RectsInfo.aRects[1], pRects->aRects, sizeof (RECT) * pRects->cRects);
+                bSend = true;
             }
             else
@@ -426 +434 @@
                     }
                 }
+                pDrCmd->fFlags.Value = 0;
                 pDrCmd->RectsInfo.cRects = pRects->cRects;
-            }
-
-            Assert(pDrCmd->fFlags.Value == 0);
-            RECT *pDirtyRect;
-            bool bSend = false;
-            if (bRectShanged)
-            {
-                pDrCmd->fFlags.bSetViewRect = 1;
-                pDrCmd->RectsInfo.aRects[0] = *pContextRect;
-                pDirtyRect = &pDrCmd->RectsInfo.aRects[1];
-                pContext->ViewRect = *pContextRect;
-                bSend = true;
-            }
-            else
-            {
-                pDirtyRect = pDrCmd->RectsInfo.aRects;
+                memcpy(&pDrCmd->RectsInfo.aRects[0], pRects->aRects, sizeof (RECT) * pRects->cRects);
 
                 if (pContext->pLastReportedRects)
@@ -460 +454 @@
                             cRects = pContext->pLastReportedRects->RectsInfo.cRects;
                         }
-                        bSend = (pDrCmd->RectsInfo.cRects == cRects)
-                                && !memcmp(paRects, pDrCmd->RectsInfo.aRects, cRects * sizeof (RECT));
+                        bSend = (pDrCmd->RectsInfo.cRects != cRects)
+                                || memcmp(paRects, pDrCmd->RectsInfo.aRects, cRects * sizeof (RECT));
                     }
                     else
@@ -481 +475 @@
 
                 pDrCmd->fFlags.bSetVisibleRects = 1;
-                memcpy (pDirtyRect, pRects->aRects, sizeof (RECT) * pRects->cRects);
 
                 vboxVideoCmCmdRetain(pDrCmd);