Changeset 69665 in vbox for trunk

Timestamp:

Nov 13, 2017 7:00:48 AM (7 years ago)

Author:

vboxsync

Message:

Devices/Graphics: VMSVGA D3D backend: added SVGA3D_R8G8B8A8_UNORM, comment, fix for instancing cleanup.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA3d-shared.cpp (modified) (1 diff)
• DevVGA-SVGA3d-win.cpp (modified) (3 diffs)
• vmsvga/svga3d_reg.h (modified) (2 diffs)

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

@@ -429 +429 @@
         *pcyBlock = 1;
         return 8;
+    case SVGA3D_R8G8B8A8_UNORM:
     case SVGA3D_R8G8B8A8_SNORM:
         *pcxBlock = 1;

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

@@ -952 +952 @@
         return D3DFMT_A4R4G4B4;
 
+    case SVGA3D_R8G8B8A8_UNORM:
+        return D3DFMT_A8B8G8R8;
+
     case SVGA3D_Z_D32:
         return D3DFMT_D32;
@@ -5801 +5804 @@
     }
 
+    /* iCurrentStreamId is equal to the total number of streams and the value is used for cleanup at the function end. */
+
     AssertRCReturn(rc, rc);
 
@@ -5931 +5936 @@
     }
 
-    /* "When you are finished rendering the instance data, be sure to reset the vertex stream frequency back..." */
-    for (i = 0; i < cVertexDivisor; ++i)
-    {
-        LogFunc(("reset stream freq %d\n", i));
-        HRESULT hr2 = pContext->pDevice->SetStreamSourceFreq(i, 1);
-        AssertMsg(hr2 == D3D_OK, ("SetStreamSourceFreq(%d, 1) failed with %x\n", i, hr2)); RT_NOREF(hr2);
+    if (cVertexDivisor)
+    {
+        /* "When you are finished rendering the instance data, be sure to reset the vertex stream frequency back..." */
+        for (i = 0; i < iCurrentStreamId; ++i)
+        {
+            LogFunc(("reset stream freq %d\n", i));
+            HRESULT hr2 = pContext->pDevice->SetStreamSourceFreq(i, 1);
+            AssertMsg(hr2 == D3D_OK, ("SetStreamSourceFreq(%d, 1) failed with %x\n", i, hr2)); RT_NOREF(hr2);
+        }
     }
 

trunk/src/VBox/Devices/Graphics/vmsvga/svga3d_reg.h

@@ -160 +160 @@
    SVGA3D_AYUV                         = 45,
 
+   SVGA3D_R8G8B8A8_UNORM               = 68, /// @todo use headers from newer Mesa
+
    SVGA3D_BC4_UNORM                    = 108,
    SVGA3D_BC5_UNORM                    = 111,
@@ -168 +170 @@
    SVGA3D_Z_D24S8_INT                  = 120,
 
-   SVGA3D_R8G8B8A8_SNORM               = 127, ///@todo use headers from newer Mesa
-   SVGA3D_R16G16_UNORM                 = 129, ///@todo use headers from newer Mesa
+   SVGA3D_R8G8B8A8_SNORM               = 127, /// @todo use headers from newer Mesa
+   SVGA3D_R16G16_UNORM                 = 129, /// @todo use headers from newer Mesa
 
    SVGA3D_FORMAT_MAX