Changeset 57083 in vbox for trunk/src/VBox

Timestamp:

Jul 26, 2015 8:49:04 PM (9 years ago)

Author:

vboxsync

Message:

VMSVGA3d: Corresponding win build fixes.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-shared.cpp (modified) (1 diff)
• DevVGA-SVGA3d-shared.h (modified) (4 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.cpp

@@ -444 +444 @@
      */
     uint32_t iStart = 0;
-    uint32_t iEnd   = pEnumMap->cValues;
+    uint32_t iEnd   = (uint32_t)pEnumMap->cValues;
     for (;;)
     {

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-shared.h

@@ -1508 +1508 @@
     { D3DFMT_FORCE_DWORD    , "FORCE_DWORD" },
 };
+VMSVGAINFOENUMMAP_MAKE(static, g_D3DFormat2String, g_aD3DFormats, "D3DFMT_");
 
 /** Values for D3DMULTISAMPLE_TYPE, prefix D3DMULTISAMPLE_. */
@@ -1531 +1532 @@
     { D3DMULTISAMPLE_FORCE_DWORD    , "FORCE_DWORD" },
 };
+VMSVGAINFOENUMMAP_MAKE(static, g_D3DMultiSampleType2String, g_aD3DMultiSampleTypes, "D3DMULTISAMPLE_");
 
 /** D3DUSAGE_XXX flag value, prefix D3DUSAGE_. */
@@ -1625 +1627 @@
 #ifdef VMSVGA3D_DIRECT3D
     pHlp->pfnPrintf(pHlp, "formatD3D:               %s\n",
-                    vmsvgaFormatEnumValueEx(szTmp, sizeof(szTmp), NULL, pSurface->formatD3D,
-                                            "D3DFMT_", g_aD3DFormats, RT_ELEMENTS(g_aD3DFormats)));
+                    vmsvgaFormatEnumValueEx(szTmp, sizeof(szTmp), NULL, pSurface->formatD3D, true, &g_D3DFormat2String));
     pHlp->pfnPrintf(pHlp, "fUsageD3D:               %#x", pSurface->fUsageD3D);
     vmsvga3dInfoU32Flags(pHlp, pSurface->fUsageD3D, "D3DUSAGE_", g_aD3DUsageFlags, RT_ELEMENTS(g_aD3DUsageFlags));
@@ -1632 +1633 @@
     pHlp->pfnPrintf(pHlp, "multiSampleTypeD3D:      %s\n",
                     vmsvgaFormatEnumValueEx(szTmp, sizeof(szTmp), NULL, pSurface->multiSampleTypeD3D,
-                                            "D3DMULTISAMPLE", g_aD3DMultiSampleTypes, RT_ELEMENTS(g_aD3DMultiSampleTypes)));
+                                            true, &g_D3DMultiSampleType2String));
     if (pSurface->hSharedObject != NULL)
         pHlp->pfnPrintf(pHlp, "hSharedObject:           %p\n", pSurface->hSharedObject);