Changeset 32496 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display

Timestamp:

Sep 14, 2010 10:14:46 PM (14 years ago)

Author:

vboxsync

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

65872

Message:

wddm/3d: multi-swapchain fixes (for win7 & multi-monitor)

Location:

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

Files:

• VBoxDispD3D.cpp (modified) (6 diffs)
• VBoxDispD3D.h (modified) (1 diff)
• VBoxDispMp.cpp (modified) (1 diff)

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

@@ -1384 +1384 @@
 }
 
+static HRESULT vboxWddmSwapchainKmSynch(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_SWAPCHAIN pSwapchain)
+{
+    struct
+    {
+        VBOXDISPIFESCAPE_SWAPCHAININFO SwapchainInfo;
+        D3DKMT_HANDLE ahAllocs[VBOXWDDMDISP_MAX_SWAPCHAIN_SIZE];
+    } Buf;
+
+    memset(&Buf.SwapchainInfo, 0, sizeof (Buf.SwapchainInfo));
+    Buf.SwapchainInfo.EscapeHdr.escapeCode = VBOXESC_SWAPCHAININFO;
+    Buf.SwapchainInfo.SwapchainInfo.hSwapchainKm = pSwapchain->hSwapchainKm;
+    Buf.SwapchainInfo.SwapchainInfo.hSwapchainUm = (VBOXDISP_UMHANDLE)pSwapchain;
+//    Buf.SwapchainInfo.SwapchainInfo.Rect;
+//    Buf.SwapchainInfo.SwapchainInfo.u32Reserved;
+    Buf.SwapchainInfo.SwapchainInfo.cAllocs = pSwapchain->cRTs;
+    for (UINT i = 0; i < Buf.SwapchainInfo.SwapchainInfo.cAllocs; ++i)
+    {
+        Assert(pSwapchain->aRTs[i].pAlloc->hAllocation);
+        Buf.SwapchainInfo.SwapchainInfo.ahAllocs[i] = pSwapchain->aRTs[i].pAlloc->hAllocation;
+    }
+
+    D3DDDICB_ESCAPE DdiEscape = {0};
+    DdiEscape.hContext = pDevice->DefaultContext.ContextInfo.hContext;
+    DdiEscape.hDevice = pDevice->hDevice;
+//    DdiEscape.Flags.Value = 0;
+    DdiEscape.pPrivateDriverData = &Buf.SwapchainInfo;
+    DdiEscape.PrivateDriverDataSize = RT_OFFSETOF(VBOXDISPIFESCAPE_SWAPCHAININFO, SwapchainInfo.ahAllocs[Buf.SwapchainInfo.SwapchainInfo.cAllocs]);
+    HRESULT hr = pDevice->RtCallbacks.pfnEscapeCb(pDevice->pAdapter->hAdapter, &DdiEscape);
+    Assert(hr == S_OK);
+    if (hr == S_OK)
+    {
+        pSwapchain->hSwapchainKm = Buf.SwapchainInfo.SwapchainInfo.hSwapchainKm;
+    }
+
+    return hr;
+}
+
+static HRESULT vboxWddmSwapchainKmDestroy(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_SWAPCHAIN pSwapchain)
+{
+    HRESULT hr = S_OK;
+    if (pSwapchain->hSwapchainKm)
+    {
+        /* submit empty swapchain to destroy the KM one */
+        UINT cOldRTc = pSwapchain->cRTs;
+        pSwapchain->cRTs = 0;
+        hr = vboxWddmSwapchainKmSynch(pDevice, pSwapchain);
+        Assert(hr == S_OK);
+        Assert(!pSwapchain->hSwapchainKm);
+        pSwapchain->cRTs = cOldRTc;
+    }
+    return hr;
+}
 static HRESULT vboxWddmSwapchainDestroyIf(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_SWAPCHAIN pSwapchain)
 {
@@ -1410 +1462 @@
     }
     vboxWddmSwapchainDestroyIf(pDevice, pSwapchain);
+    vboxWddmSwapchainKmDestroy(pDevice, pSwapchain);
     vboxWddmSwapchainInit(pSwapchain);
 }
@@ -1803 +1856 @@
     return hr;
 }
+
 static HRESULT vboxWddmSwapchainSynch(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_SWAPCHAIN pSwapchain)
 {
+    HRESULT hr = S_OK;
     for (int iBb = -1; iBb < int(pSwapchain->cRTs - 1); ++iBb)
     {
-        HRESULT hr = vboxWddmSwapchainRtSynch(pDevice, pSwapchain, (UINT)iBb);
+        hr = vboxWddmSwapchainRtSynch(pDevice, pSwapchain, (UINT)iBb);
         Assert(hr == S_OK);
     }
-    pSwapchain->fFlags.bChanged = 0;
-    return S_OK;
+
+    if (pSwapchain->fFlags.bChanged)
+    {
+        hr = vboxWddmSwapchainKmSynch(pDevice, pSwapchain);
+        if (hr == S_OK)
+        {
+            pSwapchain->fFlags.bChanged = 0;
+        }
+    }
+    return hr;
 }
 
@@ -4373 +4436 @@
     {
         bool bIssueCreateResource = false;
+        bool bCreateSwapchain = false;
         bool bCreateKMResource = false;
 
@@ -4649 +4713 @@
                 if (RTListIsEmpty(&pDevice->SwapchainList))
                 {
-                    PVBOXWDDMDISP_SWAPCHAIN pSwapchain;
-                    hr = vboxWddmSwapchainCreateIfForRc(pDevice, pRc, &pSwapchain);
-                    Assert(hr == S_OK);
+                    bCreateSwapchain = true;
+                    Assert(bIssueCreateResource);
                 }
                 else
@@ -4825 +4888 @@
                         pAllocation->pvMem = (void*)pSurf->pSysMem;
                         pAllocation->SurfDesc = pAllocInfo->SurfDesc;
+                    }
+
+                    if(bCreateSwapchain)
+                    {
+                        PVBOXWDDMDISP_SWAPCHAIN pSwapchain;
+                        hr = vboxWddmSwapchainCreateIfForRc(pDevice, pRc, &pSwapchain);
+                        Assert(hr == S_OK);
                     }
                 }

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.h

@@ -139 +139 @@
     IDirect3DSwapChain9 *pSwapChainIf;
     HWND hWnd;
+    VBOXDISP_KMHANDLE hSwapchainKm;
     VBOXWDDMDISP_RENDERTGT aRTs[VBOXWDDMDISP_MAX_SWAPCHAIN_SIZE];
 } VBOXWDDMDISP_SWAPCHAIN, *PVBOXWDDMDISP_SWAPCHAIN;

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

@@ -139 +139 @@
         VBOXWDDMDISP_CONTEXT *pContext = (VBOXWDDMDISP_CONTEXT*)pHdr->u64UmData;
         PVBOXVIDEOCM_CMD_RECTS_INTERNAL pCmdInternal = (PVBOXVIDEOCM_CMD_RECTS_INTERNAL)(((uint8_t*)pHdr) + sizeof (VBOXVIDEOCM_CMD_HDR));
-//        UINT iScreen = pContext->pDevice->cScreens == 1 ? pContext->pDevice->iPrimaryScreen : pCmdInternal->VidPnSourceId;
-//        PVBOXWDDMDISP_SCREEN pScreen = &pContext->pDevice->aScreens[iScreen];
-//        Assert(pScreen->hWnd);
-//        Assert(pScreen->pDevice9If);
-//        pRegions->hWnd = pScreen->hWnd;
-        PVBOXWDDMDISP_SWAPCHAIN pSwapchain = RTListNodeGetLast(&pContext->pDevice->SwapchainList, VBOXWDDMDISP_SWAPCHAIN, ListEntry);
+        PVBOXWDDMDISP_SWAPCHAIN pSwapchain = (PVBOXWDDMDISP_SWAPCHAIN)pCmdInternal->hSwapchainUm;
+        /* todo: synchronization */
         Assert(pSwapchain);
         pRegions->hWnd = pSwapchain->hWnd;