Changeset 32501 in vbox for trunk/src/VBox/Additions

Timestamp:

Sep 15, 2010 8:51:16 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: multiswapchain fixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispD3D.cpp (modified) (7 diffs)
• Miniport/wddm/VBoxVideoMisc.cpp (modified) (3 diffs)
• Wine/wined3d/context.c (modified) (1 diff)

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

@@ -1399 +1399 @@
 //    Buf.SwapchainInfo.SwapchainInfo.u32Reserved;
     Buf.SwapchainInfo.SwapchainInfo.cAllocs = pSwapchain->cRTs;
+    UINT cAllocsKm = 0;
     for (UINT i = 0; i < Buf.SwapchainInfo.SwapchainInfo.cAllocs; ++i)
     {
-        Assert(pSwapchain->aRTs[i].pAlloc->hAllocation);
+//        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;
+        if (Buf.SwapchainInfo.SwapchainInfo.ahAllocs[i])
+            ++cAllocsKm;
+    }
+
+    Assert(cAllocsKm == Buf.SwapchainInfo.SwapchainInfo.cAllocs || !cAllocsKm);
+
+    if (cAllocsKm)
+    {
+        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;
+    }
+    return S_OK;
 }
 
@@ -1738 +1747 @@
     if (!pSwapchain)
     {
-        Assert(0);
+//        Assert(0);
         /* first search for the swapchain the alloc might be added to */
         PVBOXWDDMDISP_SWAPCHAIN pCur = RTListNodeGetFirst(&pDevice->SwapchainList, VBOXWDDMDISP_SWAPCHAIN, ListEntry);
@@ -1898 +1907 @@
     /* preserve the old one */
     IDirect3DSwapChain9 * pOldIf = pSwapchain->pSwapChainIf;
-    HWND hOldWnd = pSwapchain->hWnd;
     /* first create the new one */
     D3DPRESENT_PARAMETERS Params;
@@ -1906 +1914 @@
     PVBOXWDDMDISP_ADAPTER pAdapter = pDevice->pAdapter;
     UINT cSurfs = pSwapchain->cRTs;
-    HRESULT hr;
-    HWND hWnd = NULL;
+    HRESULT hr = S_OK;
     IDirect3DDevice9 *pDevice9If = NULL;
-    hr = VBoxDispWndCreate(pAdapter, Params.BackBufferWidth, Params.BackBufferHeight, &hWnd);
-    Assert(hr == S_OK);
+    HWND hOldWnd = pSwapchain->hWnd;
+#ifndef VBOXDISP_NEWWND_ON_SWAPCHAINUPDATE
+    if (!hOldWnd)
+#endif
+    {
+        hr = VBoxDispWndCreate(pAdapter, Params.BackBufferWidth, Params.BackBufferHeight, &pSwapchain->hWnd);
+        Assert(hr == S_OK);
+    }
     if (hr == S_OK)
     {
-        pSwapchain->hWnd = hWnd;
         DWORD fFlags = D3DCREATE_HARDWARE_VERTEXPROCESSING;
         if (pDevice->fFlags.AllowMultithreading)
             fFlags |= D3DCREATE_MULTITHREADED;
 
-        Params.hDeviceWindow = hWnd;
+        Params.hDeviceWindow = pSwapchain->hWnd;
                     /* @todo: it seems there should be a way to detect this correctly since
                      * our vboxWddmDDevSetDisplayMode will be called in case we are using full-screen */
@@ -1929 +1941 @@
         if (!pDevice->pDevice9If)
         {
-            hr = pAdapter->pD3D9If->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, hWnd, fFlags, &Params, &pDevice9If);
+            hr = pAdapter->pD3D9If->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, pSwapchain->hWnd, fFlags, &Params, &pDevice9If);
             Assert(hr == S_OK);
             if (hr == S_OK)
@@ -2014 +2026 @@
                             Assert(hOldWnd);
                             pOldIf->Release();
+#ifdef VBOXDISP_NEWWND_ON_SWAPCHAINUPDATE
                             VBoxDispWndDestroy(pAdapter, hOldWnd);
+#endif
                         }
                         else
@@ -2029 +2043 @@
 
         Assert(hr != S_OK);
-
-        HRESULT tmpHr = VBoxDispWndDestroy(pAdapter, hWnd);
-        Assert(tmpHr == S_OK);
-        pSwapchain->hWnd = hOldWnd;
+#ifndef VBOXDISP_NEWWND_ON_SWAPCHAINUPDATE
+        if (!hOldWnd)
+#endif
+        {
+            HRESULT tmpHr = VBoxDispWndDestroy(pAdapter, pSwapchain->hWnd);
+            Assert(tmpHr == S_OK);
+            pSwapchain->hWnd = hOldWnd;
+        }
     }
 

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

@@ -75 +75 @@
         {
             pTbl->paData[i] = pvData;
+            ++pTbl->cData;
+            Assert(pTbl->cData <= pTbl->cSize);
             ++pTbl->iNext2Search;
             pTbl->iNext2Search %= pTbl->cSize;
@@ -92 +94 @@
         PVOID pvData = pTbl->paData[iIndex];
         pTbl->paData[iIndex] = NULL;
+        --pTbl->cData;
+        Assert(pTbl->cData <= pTbl->cSize);
         pTbl->iNext2Search = iIndex;
         return pvData;
@@ -449 +453 @@
     {
         vboxWddmSwapchainDestroy(pDevExt, pSwapchain);
+        pSwapchainInfo->SwapchainInfo.hSwapchainKm = 0;
     }
 

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c

@@ -1601 +1601 @@
     struct wined3d_context *context = NULL;
 
-    Assert(0);
+//    Assert(0);
 
     for(i = 0 ; i < swapchains ; i ++)