Changeset 37640 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jun 26, 2011 2:13:00 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: propper handling of ID3DDevice::Clear

Location:

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

Files:

• disp/wddm/VBoxDispD3D.cpp (modified) (2 diffs)
• disp/wddm/VBoxDispDbg.cpp (modified) (1 diff)
• mp/wddm/VBoxMPMisc.cpp (modified) (1 diff)

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

@@ -2591 +2591 @@
 }
 
+static HRESULT vboxWddmSwapchainBbUpdate(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_SWAPCHAIN pSwapchain, PVBOXWDDMDISP_ALLOCATION pBbAlloc)
+{
+    for (UINT i = 0; i < pSwapchain->cRTs; ++i)
+    {
+        PVBOXWDDMDISP_ALLOCATION pCurBb = vboxWddmSwapchainGetBb(pSwapchain)->pAlloc;
+        if (pCurBb == pBbAlloc)
+            return S_OK;
+
+        HRESULT hr = vboxWddmSwapchainPresentPerform(pDevice, pSwapchain);
+        if (FAILED(hr))
+        {
+            WARN(("vboxWddmSwapchainPresentPerform failed, hr (0x%x)", hr));
+            return hr;
+        }
+    }
+
+    AssertMsgFailed(("the given allocation not par of the swapchain\n"));
+    return E_FAIL;
+}
+
 static HRESULT vboxWddmSwapchainPresent(PVBOXWDDMDISP_DEVICE pDevice, PVBOXWDDMDISP_ALLOCATION pBbAlloc)
 {
@@ -2963 +2983 @@
     IDirect3DDevice9 * pDevice9If = VBOXDISP_D3DEV(pDevice);
     PVBOXWDDMDISP_SWAPCHAIN pSwapchain = vboxWddmSwapchainForAlloc(pAlloc);
+    HRESULT hr = S_OK;
     if (pSwapchain)
     {
-        /* backbuffer */
-        Assert(vboxWddmSwapchainGetBb(pSwapchain)->pAlloc == pAlloc);
-    }
-
-    HRESULT hr = S_OK;
+        hr = vboxWddmSwapchainBbUpdate(pDevice, pSwapchain, pAlloc);
+        if (FAILED(hr))
+            return hr;
+    }
+
     IDirect3DSurface9 *pD3D9Surf;
     if (!bOnSwapchainSynch && pSwapchain)

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

@@ -448 +448 @@
         case 0x000006d9: /* <- RPC exception, ignore */
         case 0x406d1388: /* <- VS/WinDbg thread naming exception, ignore */
+        case 0xe0434f4d: /* <- CLR exception */
             break;
         default:

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

@@ -82 +82 @@
     if (pTbl->cSize == pTbl->cData)
     {
-        Assert(0);
         NTSTATUS Status = vboxWddmHTableRealloc(pTbl, pTbl->cSize + RT_MAX(10, pTbl->cSize/4));
         Assert(Status == STATUS_SUCCESS);