Changeset 32545 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm/VBoxDispD3D.cpp

Timestamp:

Sep 16, 2010 10:00:43 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine multi-swapchain fixes, umd driver fixes

File:

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

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

@@ -1917 +1917 @@
     IDirect3DDevice9 *pDevice9If = NULL;
     HWND hOldWnd = pSwapchain->hWnd;
+//#define VBOXDISP_NEWWND_ON_SWAPCHAINUPDATE
 #ifndef VBOXDISP_NEWWND_ON_SWAPCHAINUPDATE
     if (!hOldWnd)
@@ -4759 +4760 @@
                             Assert(hr == S_OK);
                             if (hr == S_OK)
+                            {
+                                if(pResource->Flags.Primary)
+                                {
+                                    for (UINT i = 0; i < pResource->SurfCount; ++i)
+                                    {
+                                        vboxWddmSwapchainFindCreate(pDevice, &pRc->aAllocations[i]);
+                                    }
+                                    Assert(bIssueCreateResource);
+                                }
                                 continue;
+                            }
 
                             /* fail branch */
@@ -5632 +5643 @@
         {
 #ifndef VBOXWDDM_WITH_VISIBLE_FB
-            if (pSrcSwapchain && vboxWddmSwapchainGetFb(pSrcSwapchain)->pAlloc != pSrcAlloc
+            if (pSrcSwapchain
+                    && pSrcSwapchain->pRenderTargetFbCopy
+                    && vboxWddmSwapchainGetFb(pSrcSwapchain)->pAlloc != pSrcAlloc
                     && vboxWddmSwapchainNumRTs(pSrcSwapchain) > 1) /* work-around wine backbuffer */
             {
@@ -5671 +5684 @@
                     pSrcSurfIf = pSrcSwapchain->pRenderTargetFbCopy;
                     Assert(pSrcSurfIf);
-                    hr = pDevice9If->GetFrontBufferData(0, pSrcSurfIf);
+                    hr = pSrcSwapchain->pSwapChainIf->GetFrontBufferData(pSrcSurfIf);
                     Assert(hr == S_OK);
                     if (hr == S_OK)