Changeset 32699 in vbox for trunk/src/VBox/Additions/WINNT/Graphics

Timestamp:

Sep 22, 2010 3:07:44 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: [partial] fix to the first black frame with Aero on Win7

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

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

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

@@ -1824 +1824 @@
     IDirect3DSurface9 *pD3D9Surf;
     UINT iRt = vboxWddmSwapchainIdxBb2Rt(pSwapchain, iBb);
+    Assert(iRt < pSwapchain->cRTs);
     PVBOXWDDMDISP_RENDERTGT pRt = &pSwapchain->aRTs[iRt];
     HRESULT hr = pSwapchain->pSwapChainIf->GetBackBuffer(iBb, D3DBACKBUFFER_TYPE_MONO, &pD3D9Surf);
@@ -1839 +1840 @@
                 if (pD3D9OldSurf && pD3D9OldSurf != pD3D9Surf)
                 {
-                    Assert(0);
-                    hr = pDevice->pDevice9If->StretchRect(pD3D9OldSurf, NULL, pD3D9Surf, NULL, D3DTEXF_NONE);
-                    Assert(hr == S_OK);
+                    VOID *pvSwapchain = NULL;
+                    HRESULT tmpHr = pD3D9OldSurf->GetContainer(IID_IDirect3DSwapChain9, &pvSwapchain);
+                    if (tmpHr == S_OK)
+                    {
+                        Assert(pvSwapchain);
+                        ((IDirect3DSwapChain9 *)pvSwapchain)->Release();
+                    }
+                    else
+                    {
+                        Assert(!pvSwapchain);
+                    }
+                    if (pvSwapchain != pSwapchain->pSwapChainIf)
+                    {
+                        Assert(0);
+                        hr = pDevice->pDevice9If->StretchRect(pD3D9OldSurf, NULL, pD3D9Surf, NULL, D3DTEXF_NONE);
+                        Assert(hr == S_OK);
+                    }
                 }
             }
@@ -4780 +4795 @@
                         }
                         Assert(pAllocation->D3DWidth >= pSurf->Width);
-#ifdef DEBUG_misha
-                        /* break to test */
-                        Assert(pAllocation->D3DWidth == pSurf->Width);
-#endif
                     }
                 }

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

@@ -1472 +1472 @@
     SIZE_T cTgtPaths;
     NTSTATUS Status = pVidPnTopologyInterface->pfnGetNumPathsFromSource(hVidPnTopology, VidPnSourceId, &cTgtPaths);
-    Assert(Status == STATUS_SUCCESS);
+    Assert(Status == STATUS_SUCCESS || Status == STATUS_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY);
     if (Status == STATUS_SUCCESS)
     {
@@ -1492 +1492 @@
         }
     }
-    else
+    else if (Status != STATUS_GRAPHICS_SOURCE_NOT_IN_TOPOLOGY)
         drprintf((__FUNCTION__": pfnGetNumPathsFromSource failed Status(0x%x)\n", Status));
 

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

@@ -1661 +1661 @@
     struct wined3d_context *context = NULL;
 
-#ifdef DEBUG_misha
-    Assert(0);
-#endif
-
     for(i = 0 ; i < device->numContexts ; i ++)
     {