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

Timestamp:

Sep 17, 2010 7:57:18 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: Aero working cleanly on win7

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Display/wddm

Files:

• VBoxDispD3D.cpp (modified) (7 diffs)
• VBoxDispD3D.h (modified) (1 diff)

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

@@ -3618 +3618 @@
     HRESULT hr = S_OK;
 
-    if (pSrcRc->aAllocations[0].SurfDesc.width == pDstRc->aAllocations[0].SurfDesc.width
+#ifdef DEBUG_misha
+                bool bDo = false;
+                IDirect3DSurface9 *pTstSrcSurfIf = NULL;
+                IDirect3DSurface9 *pTstDstSurfIf = NULL;
+
+                if (g_VDbgTstDumpEnable)
+                {
+                    hr = vboxWddmSurfGet(pSrcRc, 0, &pTstSrcSurfIf);
+                    Assert(hr == S_OK);
+                    hr = vboxWddmSurfGet(pDstRc, 0, &pTstDstSurfIf);
+                    Assert(hr == S_OK);
+
+                    if (g_VDbgTstDumpOnSys2VidSameSizeEnable)
+                    {
+                        if (pDstRc->RcDesc.enmPool != D3DDDIPOOL_SYSTEMMEM
+                                && pSrcRc->RcDesc.enmPool == D3DDDIPOOL_SYSTEMMEM)
+                        {
+                            D3DSURFACE_DESC SrcDesc;
+                            HRESULT hr = pTstSrcSurfIf->GetDesc(&SrcDesc);
+                            Assert(hr == S_OK);
+                            if (hr == S_OK)
+                            {
+                                D3DSURFACE_DESC DstDesc;
+                                hr = pTstDstSurfIf->GetDesc(&DstDesc);
+                                Assert(hr == S_OK);
+                                if (hr == S_OK)
+                                {
+                                    if (SrcDesc.Width == DstDesc.Width
+                                            && SrcDesc.Height == DstDesc.Height)
+                                    {
+                                        bDo = true;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if (bDo)
+                {
+                    RECT DstRect;
+                    vboxWddmRectMoved(&DstRect, &pData->SrcRect, pData->DstPoint.x, pData->DstPoint.y);
+                    vboxVDbgDumpSurfData((pDevice, "TexBlt-pre Src:\n", pSrcRc, 0, &pData->SrcRect, pTstSrcSurfIf, "\n"));
+                    vboxVDbgDumpSurfData((pDevice, "TexBlt-pre Dst:\n", pDstRc, 0, &DstRect, pTstDstSurfIf, "\n"));
+                }
+#endif
+
+    if (pSrcRc->aAllocations[0].D3DWidth == pDstRc->aAllocations[0].D3DWidth
             && pSrcRc->aAllocations[0].SurfDesc.height == pDstRc->aAllocations[0].SurfDesc.height
             && pSrcRc->RcDesc.enmFormat == pDstRc->RcDesc.enmFormat
@@ -3659 +3706 @@
     }
 
+#ifdef DEBUG_misha
+    if (bDo)
+    {
+        RECT DstRect;
+        vboxWddmRectMoved(&DstRect, &pData->SrcRect, pData->DstPoint.x, pData->DstPoint.y);
+        vboxVDbgDumpSurfData((pDevice, "TexBlt-post Src:\n", pSrcRc, 0, &pData->SrcRect, pTstSrcSurfIf, "\n"));
+        vboxVDbgDumpSurfData((pDevice, "TexBlt-post Dst:\n", pDstRc, 0, &DstRect, pTstDstSurfIf, "\n"));
+    }
+
+    if (pTstDstSurfIf)
+        pTstDstSurfIf->Release();
+    if (pTstSrcSurfIf)
+        pTstSrcSurfIf->Release();
+#endif
     vboxVDbgPrintF(("<== "__FUNCTION__", hDevice(0x%p), hr(0x%x)\n", hDevice, hr));
     return hr;
@@ -4495 +4556 @@
             pAllocation->iAlloc = i;
             pAllocation->pRc = pRc;
+            pAllocation->D3DWidth = pSurf->Width;
             pAllocation->pvMem = (void*)pSurf->pSysMem;
             pAllocation->SurfDesc.pitch = pSurf->SysMemPitch;
@@ -4673 +4735 @@
                 IDirect3DTexture9 *pD3DIfTex;
                 HANDLE hSharedHandle = NULL;
+                if (pResource->Pool == D3DDDIPOOL_SYSTEMMEM)
+                {
+                    Assert(pSurf->pSysMem);
+                    Assert(pSurf->SysMemPitch);
+                    UINT bpp = vboxWddmCalcBitsPerPixel(pResource->Format);
+                    Assert(bpp);
+                    if (bpp)
+                    {
+                        pAllocation->D3DWidth = ((pSurf->SysMemPitch << 3) / bpp);
+                        if ((pSurf->SysMemPitch << 3) % bpp)
+                        {
+                            Assert(0);
+                            ++pAllocation->D3DWidth;
+                        }
+                        Assert(pAllocation->D3DWidth >= pSurf->Width);
+#ifdef DEBUG_misha
+                        /* break to test */
+                        Assert(pAllocation->D3DWidth == pSurf->Width);
+#endif
+                    }
+                }
 #if 0
                 hr = pDevice9If->CreateTexture(pSurf->Width,
-                                            pSurf->Height,
+                                            pAllocation->D3DWidth,
                                             pResource->SurfCount,
                                             vboxDDI2D3DUsage(pResource->Flags),
@@ -4685 +4768 @@
 #else
                 hr = pDevice->pAdapter->D3D.pfnVBoxWineExD3DDev9CreateTexture((IDirect3DDevice9Ex *)pDevice9If,
-                                            pSurf->Width,
+                                            pAllocation->D3DWidth,
                                             pSurf->Height,
                                             pResource->SurfCount,
@@ -6999 +7082 @@
 //        Assert(pAlloc->SurfDesc.pitch == Lr.Pitch);
         vboxVDbgMpPrint((pDevice, "<?dml?><exec cmd=\"!vbvdbg.ms 0x%p 0n%d 0n%d 0n%d 0n%d\">surface info</exec>\n",
-                Lr.pBits, pAlloc->SurfDesc.width, pAlloc->SurfDesc.height, bpp, Lr.Pitch));
+                Lr.pBits, pAlloc->D3DWidth, pAlloc->SurfDesc.height, bpp, Lr.Pitch));
         if (pRect)
         {
@@ -7056 +7139 @@
         bFrontBuf = (vboxWddmSwapchainGetBb(pSwapchain)->pAlloc == pAlloc);
     }
-    vboxVDbgDoMpPrintF(pDevice, "%s width(%d), height(%d), format(%d), usage(%s), %s", pPrefix,
-            pAlloc->SurfDesc.width, pAlloc->SurfDesc.height, pAlloc->SurfDesc.format,
+    vboxVDbgDoMpPrintF(pDevice, "%s D3DWidth(%d), width(%d), height(%d), format(%d), usage(%s), %s", pPrefix,
+            pAlloc->D3DWidth, pAlloc->SurfDesc.width, pAlloc->SurfDesc.height, pAlloc->SurfDesc.format,
             bPrimary ?
                     (bFrontBuf ? "Front Buffer" : "Back Buffer")

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

@@ -212 +212 @@
     struct VBOXWDDMDISP_RESOURCE *pRc;
     void* pvMem;
+    UINT D3DWidth;
     /* object type is defined by enmD3DIfType enum */
     IUnknown *pD3DIf;