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

Timestamp:

Aug 24, 2010 4:29:20 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: work-around wine backbuffer creation for d3d devices w/o backbuffer

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp (modified) (4 diffs)

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

@@ -1106 +1106 @@
 
     pAlloc = &pRc->aAllocations[iNewRTFB];
+    if (pRc->cAllocations > 1)
+    {
 #ifdef VBOXWDDM_WITH_VISIBLE_FB
-    HRESULT tmpHr = vboxWddmRenderTargetUpdateSurface(pDevice, pAlloc, ~0UL /* <- for the frontbuffer */);
-    Assert(tmpHr == S_OK);
+        HRESULT tmpHr = vboxWddmRenderTargetUpdateSurface(pDevice, pAlloc, ~0UL /* <- for the frontbuffer */);
+        Assert(tmpHr == S_OK);
 #else
-    if (pAlloc->pD3DIf)
-    {
-        pAlloc->pD3DIf->Release();
-        pAlloc->pD3DIf = NULL;
-    }
+        if (pAlloc->pD3DIf)
+        {
+            pAlloc->pD3DIf->Release();
+            pAlloc->pD3DIf = NULL;
+        }
 #endif
+    }
+    else
+    {
+        /* work-around wine backbuffer for devices w/o backbuffers */
+        HRESULT tmpHr = vboxWddmRenderTargetUpdateSurface(pDevice, pAlloc, 0);
+        Assert(tmpHr == S_OK);
+    }
 
 #ifdef DEBUG
@@ -1123 +1132 @@
         if (iNewRTFB == i)
         {
-            Assert(!pAlloc->pD3DIf);
+            Assert((!pAlloc->pD3DIf) == (pRc->cAllocations > 1));
         }
 
@@ -4161 +4170 @@
             {
                 ++cProcessed;
-                if (pScreen->pRenderTargetRc->cAllocations == 1)
-                {
-                    hr = pScreen->pDevice9If->Present(NULL, NULL, NULL, NULL);
-                    Assert(hr == S_OK);
-                }
-                else
+//                if (pScreen->pRenderTargetRc->cAllocations == 1)
+//                {
+//                    hr = pScreen->pDevice9If->Present(NULL, NULL, NULL, NULL);
+//                    Assert(hr == S_OK);
+//                }
+//                else
                 {
                     hr = pDevice->pAdapter->D3D.pfnVBoxWineExD3DDev9Flush((IDirect3DDevice9Ex*)pScreen->pDevice9If);
@@ -4547 +4556 @@
         {
 #ifndef VBOXWDDM_WITH_VISIBLE_FB
-            if (pSrcRc == pScreen->pRenderTargetRc && pScreen->iRenderTargetFrontBuf == pData->SrcSubResourceIndex)
+            if (pSrcRc == pScreen->pRenderTargetRc && pScreen->iRenderTargetFrontBuf == pData->SrcSubResourceIndex
+                    && pScreen->pRenderTargetRc->cAllocations > 1) /* work-around wine backbuffer */
             {
                 PVBOXWDDMDISP_ALLOCATION pSrcAlloc = &pSrcRc->aAllocations[pData->SrcSubResourceIndex];