Changeset 38565 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Video

Timestamp:

Aug 30, 2011 9:28:15 AM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

73733

Message:

wddm/3d: reuse window for wine swapchains representing one and the same 3d swapchain, bugfixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• common/wddm/VBoxMPIf.h (modified) (1 diff)
• disp/wddm/VBoxDispCm.cpp (modified) (2 diffs)
• disp/wddm/VBoxDispCm.h (modified) (1 diff)
• disp/wddm/VBoxDispD3D.cpp (modified) (3 diffs)
• mp/wddm/VBoxMPVidPn.cpp (modified) (2 diffs)
• mp/wddm/VBoxMPWddm.cpp (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -321 +321 @@
     {
         VBOXDISP_UMHANDLE hSwapchainUm;
-        uint64_t u64Alignment;
+        uint64_t hWnd;
+        uint64_t u64Value;
     };
     VBOXVIDEOCM_CMD_RECTS Cmd;
 } VBOXVIDEOCM_CMD_RECTS_INTERNAL, *PVBOXVIDEOCM_CMD_RECTS_INTERNAL;
+
+typedef struct VBOXVIDEOCM_CMD_RECTS_HDR
+{
+    VBOXVIDEOCM_CMD_HDR Hdr;
+    VBOXVIDEOCM_CMD_RECTS_INTERNAL Data;
+} VBOXVIDEOCM_CMD_RECTS_HDR, *PVBOXVIDEOCM_CMD_RECTS_HDR;
 
 #define VBOXVIDEOCM_CMD_RECTS_INTERNAL_SIZE4CRECTS(_cRects) (RT_OFFSETOF(VBOXVIDEOCM_CMD_RECTS_INTERNAL, Cmd.RectsInfo.aRects[(_cRects)]))

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispCm.cpp

@@ -225 +225 @@
 }
 
+HRESULT vboxDispCmCmdSessionInterruptWait(PVBOXDISPCM_SESSION pSession)
+{
+    SetEvent(pSession->hEvent);
+    return S_OK;
+}
+
 HRESULT vboxDispCmSessionCmdGet(PVBOXDISPCM_SESSION pSession, PVBOXDISPIFESCAPE_GETVBOXVIDEOCMCMD pCmd, uint32_t cbCmd, DWORD dwMilliseconds)
 {
@@ -275 +281 @@
 }
 
+HRESULT vboxDispCmCmdInterruptWait()
+{
+    return vboxDispCmCmdSessionInterruptWait(&g_pVBoxCmMgr.Session);
+}
+
 void vboxDispCmLog(LPCSTR pszMsg)
 {

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispCm.h

@@ -31 +31 @@
 HRESULT vboxDispCmCmdGet(PVBOXDISPIFESCAPE_GETVBOXVIDEOCMCMD pCmd, uint32_t cbCmd, DWORD dwMilliseconds);
 
+HRESULT vboxDispCmCmdInterruptWait();
+
 void vboxDispCmLog(LPCSTR pszMsg);
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -2398 +2398 @@
                     }
                 }
+
+                /* re-use swapchain window
+                 * this will invalidate the previusly used swapchain */
+                Params.hDeviceWindow = pSwapchain->hWnd;
 
                 hr = pDevice->pDevice9If->CreateAdditionalSwapChain(&Params, &pNewIf);
@@ -5919 +5923 @@
                 VBOXVDBG_BREAK_SHARED(pSrcRc);
                 VBOXVDBG_BREAK_SHARED(pDstRc);
-                VBOXVDBG_DUMP_BLT_ENTER(pSrcAlloc, pSrcSurfIf, &pData->SrcRect, pDstAlloc, pDstSurfIf, &pData->DstRect);
+                if (   pSrcAlloc->SurfDesc.width == 658 && pSrcAlloc->SurfDesc.height == 493
+                    && pData->SrcRect.left == 0 && pData->SrcRect.top == 0
+                    && pData->SrcRect.right == 658 && pData->SrcRect.bottom == 493
+                    && pDstAlloc->SurfDesc.width == 756 && pDstAlloc->SurfDesc.height == 493
+                    && pData->DstRect.left == 0 && pData->DstRect.top == 0
+                    && pData->DstRect.right == 658 && pData->DstRect.bottom == 493)
+                {
+                    VBOXVDBG_DUMP_BLT_ENTER(pSrcAlloc, pSrcSurfIf, &pData->SrcRect, pDstAlloc, pDstSurfIf, &pData->DstRect);
+                }
 
                 /* we support only Point & Linear, we ignore [Begin|Continue|End]PresentToDwm */
@@ -5930 +5942 @@
                 Assert(hr == S_OK);
 
-                VBOXVDBG_DUMP_BLT_LEAVE(pSrcAlloc, pSrcSurfIf, &pData->SrcRect, pDstAlloc, pDstSurfIf, &pData->DstRect);
+                if (   pSrcAlloc->SurfDesc.width == 658 && pSrcAlloc->SurfDesc.height == 493
+                    && pData->SrcRect.left == 0 && pData->SrcRect.top == 0
+                    && pData->SrcRect.right == 658 && pData->SrcRect.bottom == 493
+                    && pDstAlloc->SurfDesc.width == 756 && pDstAlloc->SurfDesc.height == 493
+                    && pData->DstRect.left == 0 && pData->DstRect.top == 0
+                    && pData->DstRect.right == 658 && pData->DstRect.bottom == 493)
+                {
+                    VBOXVDBG_DUMP_BLT_LEAVE(pSrcAlloc, pSrcSurfIf, &pData->SrcRect, pDstAlloc, pDstSurfIf, &pData->DstRect);
+                }
 
                 pSrcSurfIf->Release();

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPVidPn.cpp

@@ -1532 +1532 @@
 {
     PVBOXVIDPNCOFUNCMODALITY pCbContext = (PVBOXVIDPNCOFUNCMODALITY)pContext;
-    D3DKMDT_VIDPN_PRESENT_PATH AdjustedPath = {};
+    D3DKMDT_VIDPN_PRESENT_PATH AdjustedPath = {0};
     NTSTATUS Status = STATUS_SUCCESS;
     bool bUpdatePath = false;
@@ -1771 +1771 @@
         paItems[i].enmState = VBOXVIDPNPATHITEM_STATE_NOT_EXISTS;
     }
-    VBOXVIDPNGETPATHSINFO CbContext = {};
+    VBOXVIDPNGETPATHSINFO CbContext = {0};
     CbContext.Status = STATUS_SUCCESS;
     CbContext.fBreakOnDisabled = fBreakOnDisabled;

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -517 +517 @@
 {
     NTSTATUS Status = STATUS_SUCCESS;
-    bool bChanged[VBOX_VIDEO_MAX_SCREENS] = {};
+    bool bChanged[VBOX_VIDEO_MAX_SCREENS] = {0};
     int i;