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

Timestamp:

Jul 16, 2010 5:11:31 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: Aero working cleanly!

Location:

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

Files:

• VBoxDispD3D.cpp (modified) (2 diffs)
• VBoxDispD3DCmn.h (modified) (2 diffs)

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

@@ -1253 +1253 @@
         {FALSE, D3DTSS_ALPHAARG0},               /* 27, D3DDDITSS_ALPHAARG0 */
         {FALSE, D3DTSS_RESULTARG},               /* 28, D3DDDITSS_RESULTARG */
-        {FALSE, D3DTSS_FORCE_DWORD},             /* 29, D3DDDITSS_SRGBTEXTURE */
-        {FALSE, D3DTSS_FORCE_DWORD},             /* 30, D3DDDITSS_ELEMENTINDEX */
-        {FALSE, D3DTSS_FORCE_DWORD},             /* 31, D3DDDITSS_DMAPOFFSET */
+        {TRUE, D3DSAMP_SRGBTEXTURE},             /* 29, D3DDDITSS_SRGBTEXTURE */
+        {TRUE, D3DSAMP_ELEMENTINDEX},            /* 30, D3DDDITSS_ELEMENTINDEX */
+        {TRUE, D3DSAMP_DMAPOFFSET},              /* 31, D3DDDITSS_DMAPOFFSET */
         {FALSE, D3DTSS_CONSTANT},                /* 32, D3DDDITSS_CONSTANT */
         {FALSE, D3DTSS_FORCE_DWORD},             /* 33, D3DDDITSS_DISABLETEXTURECOLORKEY */
         {FALSE, D3DTSS_FORCE_DWORD},             /* 34, D3DDDITSS_TEXTURECOLORKEYVAL */
     };
+
+    Assert(enmType > 0);
+    Assert(enmType < RT_ELEMENTS(lookup));
+    Assert(lookup[enmType].dType != D3DTSS_FORCE_DWORD);
 
     return lookup[enmType];
@@ -4470 +4474 @@
     Assert(pRc);
     Assert(pData->SubResourceIndex < pRc->cAllocations);
-    Assert(pRc == pDevice->pRenderTargetRc);
     if (pRc == pDevice->pRenderTargetRc)
     {

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

@@ -38 +38 @@
 # define VBOXWDDMDISP_DEBUG
 # define VBOXWDDMDISP_DEBUG_FLOW
+//# define VBOXWDDMDISP_DEBUG_DUMPSURFDATA
 #endif
 
@@ -82 +83 @@
         vboxVDbgDoMpPrintAlloc _m ; \
     } while (0)
+#ifdef VBOXWDDMDISP_DEBUG_DUMPSURFDATA
 #define vboxVDbgDumpSurfData(_m) \
     do { \
         vboxVDbgDoDumpSurfData _m ; \
     } while (0)
+#else
+#define vboxVDbgDumpSurfData(_m) do {} while (0)
+#endif
 #ifdef VBOXWDDMDISP_DEBUG_FLOW
 # define vboxVDbgPrintF  vboxVDbgPrint