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

Timestamp:

Jul 12, 2010 1:10:31 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: bugfixes

Location:

trunk/src/VBox/Additions/WINNT/Graphics

Files:

• Display/wddm/VBoxDispD3D.cpp (modified) (6 diffs)
• Display/wddm/VBoxDispD3D.h (modified) (1 diff)
• Miniport/wddm/VBoxVideoVdma.cpp (modified) (1 diff)

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

@@ -1072 +1072 @@
     if (hr == S_OK)
     {
+        Assert(pD3D9Surf);
         Assert(pAlloc->enmD3DIfType == VBOXDISP_D3DIFTYPE_SURFACE);
         if (pAlloc->pD3DIf)
@@ -1099 +1100 @@
     }
 
+#ifdef VBOXWDDM_WITH_VISIBLE_FB
     pAlloc = &pRc->aAllocations[iNewRTFB];
     HRESULT tmpHr = vboxWddmRenderTargetUpdateSurface(pDevice, pAlloc, ~0UL /* <- for the frontbuffer */);
     Assert(tmpHr == S_OK);
+#else
+    pAlloc = &pRc->aAllocations[iNewRTFB];
+    if (pAlloc->pD3DIf)
+    {
+        pAlloc->pD3DIf->Release();
+        pAlloc->pD3DIf = NULL;
+    }
+#endif
+
+#ifdef DEBUG
+    for (UINT i = 0; i < pRc->cAllocations; ++i)
+    {
+        pAlloc = &pRc->aAllocations[i];
+        for (UINT j = i+1; j < pRc->cAllocations; ++j)
+        {
+            PVBOXWDDMDISP_ALLOCATION pAllocJ = &pRc->aAllocations[j];
+            Assert(pAlloc->pD3DIf != pAllocJ->pD3DIf);
+        }
+    }
+#endif
     return S_OK;
 }
@@ -2382 +2404 @@
     if (VBOXDISPMODE_IS_3D(pDevice->pAdapter))
     {
+        Assert(pRc != pDevice->pRenderTargetRc || pDevice->iRenderTargetFrontBuf != pData->SubResourceIndex);
+
         if (pRc->aAllocations[0].enmD3DIfType == VBOXDISP_D3DIFTYPE_TEXTURE)
         {
@@ -3325 +3349 @@
                                 }
 
+#ifndef VBOXWDDM_WITH_VISIBLE_FB
+                                if (hr == S_OK)
+                                {
+                                    IDirect3DSurface9* pD3D9Surf;
+                                    hr = pDevice->pDevice9If->CreateRenderTarget(pRc->aAllocations[0].SurfDesc.width,
+                                            pRc->aAllocations[0].SurfDesc.height,
+                                            vboxDDI2D3DFormat(pResource->Format),
+                                            vboxDDI2D3DMultiSampleType(pResource->MultisampleType),
+                                            pResource->MultisampleQuality,
+                                            !pResource->Flags.NotLockable /* BOOL Lockable */,
+                                            &pD3D9Surf,
+                                            NULL /* HANDLE* pSharedHandle */
+                                            );
+                                    Assert(hr == S_OK);
+                                    if (hr == S_OK)
+                                    {
+                                        pDevice->pRenderTargetFbCopy = pD3D9Surf;
+                                    }
+                                }
+#endif
+
                                 if (hr != S_OK)
                                 {
@@ -3989 +4034 @@
     Assert(pDstRc->cAllocations > pData->DstSubResourceIndex);
     Assert(pSrcRc->cAllocations > pData->SrcSubResourceIndex);
+    Assert(pDstRc != pDevice->pRenderTargetRc || pDevice->iRenderTargetFrontBuf != pData->DstSubResourceIndex);
     HRESULT hr = S_OK;
     /* try StretchRect */
     IDirect3DSurface9 *pSrcSurfIf = NULL;
     IDirect3DSurface9 *pDstSurfIf = NULL;
-    hr = vboxWddmSurfGet(pSrcRc, pData->SrcSubResourceIndex, &pSrcSurfIf);
+    hr = vboxWddmSurfGet(pDstRc, pData->DstSubResourceIndex, &pDstSurfIf);
     Assert(hr == S_OK);
     if (hr == S_OK)
     {
-        Assert(pSrcSurfIf);
-        hr = vboxWddmSurfGet(pDstRc, pData->DstSubResourceIndex, &pDstSurfIf);
-        Assert(hr == S_OK);
-        if (hr == S_OK)
-        {
-            Assert(pDstSurfIf);
-            /* we support only Point & Linear, we ignore [Begin|Continue|End]PresentToDwm */
-            Assert((pData->Flags.Value & (~(0x00000100 | 0x00000200 | 0x00000400 | 0x00000001  | 0x00000002))) == 0);
-            hr = pDevice->pDevice9If->StretchRect(pSrcSurfIf,
-                                &pData->SrcRect,
-                                pDstSurfIf,
-                                &pData->DstRect,
-                                vboxDDI2D3DBltFlags(pData->Flags));
-            Assert(hr == S_OK);
-            pDstSurfIf->Release();
-        }
-        pSrcSurfIf->Release();
+        Assert(pDstSurfIf);
+        do
+        {
+#ifndef VBOXWDDM_WITH_VISIBLE_FB
+            if (pSrcRc == pDevice->pRenderTargetRc && pDevice->iRenderTargetFrontBuf == pData->SrcSubResourceIndex)
+            {
+                PVBOXWDDMDISP_ALLOCATION pSrcAlloc = &pSrcRc->aAllocations[pData->SrcSubResourceIndex];
+                PVBOXWDDMDISP_ALLOCATION pDstAlloc = &pDstRc->aAllocations[pData->DstSubResourceIndex];
+//                Assert(pSrcAlloc->SurfDesc.width == pDstAlloc->SurfDesc.width);
+//                Assert(pSrcAlloc->SurfDesc.height == pDstAlloc->SurfDesc.height);
+//                Assert(pSrcAlloc->SurfDesc.format == pDstAlloc->SurfDesc.format);
+//                Assert(pSrcAlloc->SurfDesc.bpp == pDstAlloc->SurfDesc.bpp);
+//                Assert(pSrcAlloc->SurfDesc.pitch == pDstAlloc->SurfDesc.pitch);
+//                Assert(pSrcAlloc->SurfDesc.depth == pDstAlloc->SurfDesc.depth);
+//                Assert(pSrcAlloc->SurfDesc.slicePitch == pDstAlloc->SurfDesc.slicePitch);
+//                Assert(pSrcAlloc->SurfDesc.cbSize == pDstAlloc->SurfDesc.cbSize);
+//                Assert(pData->DstRect.left == 0);
+//                Assert(pData->DstRect.top == 0);
+//                Assert(pData->DstRect.right == pDstAlloc->SurfDesc.width);
+//                Assert(pData->DstRect.bottom == pDstAlloc->SurfDesc.height);
+//                Assert(pData->SrcRect.left == 0);
+//                Assert(pData->SrcRect.top == 0);
+//                Assert(pData->SrcRect.right == pSrcAlloc->SurfDesc.width);
+//                Assert(pData->SrcRect.bottom == pSrcAlloc->SurfDesc.height);
+#if 0
+                if (pData->DstRect.left == 0 && pData->DstRect.top == 0
+                        && pData->DstRect.right == pDstAlloc->SurfDesc.width
+                        && pData->DstRect.bottom == pDstAlloc->SurfDesc.height
+                        && pData->SrcRect.left == 0 && pData->SrcRect.top == 0
+                        && pData->SrcRect.right == pSrcAlloc->SurfDesc.width
+                        && pData->SrcRect.bottom == pSrcAlloc->SurfDesc.height
+                        && pSrcAlloc->SurfDesc.width == pDstAlloc->SurfDesc.width
+                        && pSrcAlloc->SurfDesc.height == pDstAlloc->SurfDesc.height
+                        && pSrcAlloc->SurfDesc.format == pDstAlloc->SurfDesc.format)
+                {
+                    hr = pDevice->pDevice9If->GetFrontBufferData(0, pDstSurfIf);
+                    Assert(hr == S_OK);
+                    break;
+                }
+                else
+#endif
+                {
+                    pSrcSurfIf = pDevice->pRenderTargetFbCopy;
+                    Assert(pSrcSurfIf);
+                    hr = pDevice->pDevice9If->GetFrontBufferData(0, pDevice->pRenderTargetFbCopy);
+                    Assert(hr == S_OK);
+                    if (hr == S_OK)
+                    {
+                        /* do pSrcSurfIf->AddRef since we do a Release in the following if (hr == S_OK) branch */
+                        pSrcSurfIf->AddRef();
+                    }
+                }
+            }
+            else
+#endif
+            {
+                hr = vboxWddmSurfGet(pSrcRc, pData->SrcSubResourceIndex, &pSrcSurfIf);
+                Assert(hr == S_OK);
+            }
+
+            if (hr == S_OK)
+            {
+                Assert(pSrcSurfIf);
+                /* we support only Point & Linear, we ignore [Begin|Continue|End]PresentToDwm */
+                Assert((pData->Flags.Value & (~(0x00000100 | 0x00000200 | 0x00000400 | 0x00000001  | 0x00000002))) == 0);
+                hr = pDevice->pDevice9If->StretchRect(pSrcSurfIf,
+                                    &pData->SrcRect,
+                                    pDstSurfIf,
+                                    &pData->DstRect,
+                                    vboxDDI2D3DBltFlags(pData->Flags));
+                Assert(hr == S_OK);
+                pSrcSurfIf->Release();
+            }
+        } while (0);
+
+        pDstSurfIf->Release();
     }
 
@@ -4404 +4509 @@
     if (pDevice->pDevice9If)
     {
+#ifndef VBOXWDDM_WITH_VISIBLE_FB
+        pDevice->pRenderTargetFbCopy->Release();
+#endif
         pDevice->pDevice9If->Release();
         Assert(pDevice->hWnd);

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

@@ -102 +102 @@
     D3DDDI_CREATEDEVICEFLAGS fFlags;
     HWND hWnd;
+#ifndef VBOXWDDM_WITH_VISIBLE_FB
+    IDirect3DSurface9 *pRenderTargetFbCopy;
+#endif
     struct VBOXWDDMDISP_RESOURCE *pRenderTargetRc;
     uint32_t iRenderTargetFrontBuf;

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

@@ -337 +337 @@
             {
                 bool bSend = false;
-                Assert(pCmd->fFlags.Value == 0);
+                pCmd->fFlags.Value = 0;
                 pCmd->fFlags.bAddHiddenRects = 1;
                 if (pCurContext->pLastReportedRects)