Changeset 43607 in vbox for trunk

Timestamp:

Oct 11, 2012 7:09:51 AM (12 years ago)

Author:

vboxsync

Message:

wddm/3d: d3d width in SurfDesc to make it properly propagated to OpenResource

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Video

Files:

• common/wddm/VBoxMPIf.h (modified) (2 diffs)
• disp/wddm/VBoxD3DIf.cpp (modified) (3 diffs)
• disp/wddm/VBoxDispD3D.cpp (modified) (3 diffs)
• disp/wddm/VBoxDispD3D.h (modified) (1 diff)
• disp/wddm/VBoxDispDbg.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/common/wddm/VBoxMPIf.h

@@ -35 +35 @@
 
 /* One would increase this whenever definitions in this file are changed */
-#define VBOXVIDEOIF_VERSION 13
+#define VBOXVIDEOIF_VERSION 14
 
 #define VBOXWDDM_NODE_ID_SYSTEM           0
@@ -92 +92 @@
     UINT depth;
     UINT slicePitch;
+    UINT d3dWidth;
     UINT cbSize;
     D3DDDI_VIDEO_PRESENT_SOURCE_ID VidPnSourceId;

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxD3DIf.cpp

@@ -483 +483 @@
                 {
                     hr = pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9CreateCubeTexture((IDirect3DDevice9Ex *)pDevice9If,
-                                                pAllocation->D3DWidth,
+                                                pAllocation->SurfDesc.d3dWidth,
                                                 VBOXDISP_CUBEMAP_LEVELS_COUNT(pRc),
                                                 vboxDDI2D3DUsage(pRc->RcDesc.fFlags),
@@ -503 +503 @@
             {
                 hr = pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9CreateVolumeTexture((IDirect3DDevice9Ex *)pDevice9If,
-                                            pAllocation->D3DWidth,
+                                            pAllocation->SurfDesc.d3dWidth,
                                             pAllocation->SurfDesc.height,
                                             pAllocation->SurfDesc.depth,
@@ -524 +524 @@
             {
                 hr = pDevice->pAdapter->D3D.D3D.pfnVBoxWineExD3DDev9CreateTexture((IDirect3DDevice9Ex *)pDevice9If,
-                                            pAllocation->D3DWidth,
+                                            pAllocation->SurfDesc.d3dWidth,
                                             pAllocation->SurfDesc.height,
                                             pRc->cAllocations,

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.cpp

@@ -2921 +2921 @@
     VBOXVDBG_CHECK_SMSYNC(pSrcRc);
 
-    if (pSrcRc->aAllocations[0].D3DWidth == pDstRc->aAllocations[0].D3DWidth
+    if (pSrcRc->aAllocations[0].SurfDesc.d3dWidth == pDstRc->aAllocations[0].SurfDesc.d3dWidth
             && pSrcRc->aAllocations[0].SurfDesc.height == pDstRc->aAllocations[0].SurfDesc.height
             && pSrcRc->RcDesc.enmFormat == pDstRc->RcDesc.enmFormat
@@ -4113 +4113 @@
         pAllocation->iAlloc = i;
         pAllocation->pRc = pRc;
-        pAllocation->D3DWidth = pSurf->Width;
+        pAllocation->SurfDesc.d3dWidth = pSurf->Width;
         pAllocation->pvMem = (void*)pSurf->pSysMem;
         pAllocation->SurfDesc.slicePitch = pSurf->SysMemSlicePitch;
@@ -4145 +4145 @@
                 {
                     Assert(pAllocation->SurfDesc.pitch > minPitch);
-                    pAllocation->D3DWidth = vboxWddmCalcWidthForPitch(pAllocation->SurfDesc.pitch, pAllocation->SurfDesc.format);
+                    pAllocation->SurfDesc.d3dWidth = vboxWddmCalcWidthForPitch(pAllocation->SurfDesc.pitch, pAllocation->SurfDesc.format);
                     Assert(VBOXWDDMDISP_IS_TEXTURE(pRc->RcDesc.fFlags) && !pRc->RcDesc.fFlags.CubeMap); /* <- tested for textures only! */
                 }
-                Assert(pAllocation->D3DWidth >= pAllocation->SurfDesc.width);
+                Assert(pAllocation->SurfDesc.d3dWidth >= pAllocation->SurfDesc.width);
             }
             else
             {
-                Assert(pAllocation->D3DWidth == pAllocation->SurfDesc.width);
+                Assert(pAllocation->SurfDesc.d3dWidth == pAllocation->SurfDesc.width);
             }
         }

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispD3D.h

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

trunk/src/VBox/Additions/WINNT/Graphics/Video/disp/wddm/VBoxDispDbg.cpp

@@ -242 +242 @@
     {
         UINT bpp = vboxWddmCalcBitsPerPixel(pAlloc->SurfDesc.format);
-        vboxVDbgDoPrintDumpCmd("Surf Info", LockData.pData, pAlloc->D3DWidth, pAlloc->SurfDesc.height, bpp, pAlloc->SurfDesc.pitch);
+        vboxVDbgDoPrintDumpCmd("Surf Info", LockData.pData, pAlloc->SurfDesc.d3dWidth, pAlloc->SurfDesc.height, bpp, pAlloc->SurfDesc.pitch);
         if (pRect)
         {
@@ -631 +631 @@
         bFrontBuf = (vboxWddmSwapchainGetFb(pSwapchain)->pAlloc == pAlloc);
     }
-    vboxVDbgPrint(("%s D3DWidth(%d), width(%d), height(%d), format(%d), usage(%s), %s", pPrefix,
-            pAlloc->D3DWidth, pAlloc->SurfDesc.width, pAlloc->SurfDesc.height, pAlloc->SurfDesc.format,
+    vboxVDbgPrint(("%s d3dWidth(%d), width(%d), height(%d), format(%d), usage(%s), %s", pPrefix,
+            pAlloc->SurfDesc.d3dWidth, pAlloc->SurfDesc.width, pAlloc->SurfDesc.height, pAlloc->SurfDesc.format,
             bPrimary ?
                     (bFrontBuf ? "Front Buffer" : "Back Buffer")