Changeset 86009 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

Timestamp:

Sep 2, 2020 11:01:09 PM (4 years ago)

Author:

vboxsync

Message:

Devices/Graphics: Use current VMSVGA headers

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (19 diffs)

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

@@ -1097 +1097 @@
    SVGA3D_DEVCAP_SURFACEFMT_Z_DF24                 = 80,
    SVGA3D_DEVCAP_SURFACEFMT_Z_D24S8_INT            = 81,
-   SVGA3D_DEVCAP_SURFACEFMT_BC4_UNORM              = 82,
-   SVGA3D_DEVCAP_SURFACEFMT_BC5_UNORM              = 83,
+   SVGA3D_DEVCAP_SURFACEFMT_ATI1                   = 82,
+   SVGA3D_DEVCAP_SURFACEFMT_ATI2                   = 83,
 #endif
 
@@ -1624 +1624 @@
 
     /* Linux: Not referenced in current sources. */
-    case SVGA3D_DEVCAP_SURFACEFMT_BC4_UNORM:
-    case SVGA3D_DEVCAP_SURFACEFMT_BC5_UNORM:
+    case SVGA3D_DEVCAP_SURFACEFMT_ATI1:
+    case SVGA3D_DEVCAP_SURFACEFMT_ATI2:
         Log(("CAPS: Unknown CAP %s\n", vmsvga3dGetCapString(idx3dCaps)));
         rc = VERR_INVALID_PARAMETER;
@@ -1812 +1812 @@
     case SVGA3D_BUMPX8L8V8U8:
         return D3DFMT_X8L8V8U8;
-    case SVGA3D_BUMPL8V8U8:
+    case SVGA3D_FORMAT_DEAD1:
         /* No corresponding D3D9 equivalent. */
         AssertFailedReturn(D3DFMT_UNKNOWN);
@@ -1963 +1963 @@
         return (D3DFORMAT)MAKEFOURCC('A', 'Y', 'U', 'V');
 
-    case SVGA3D_BC4_UNORM:
-    case SVGA3D_BC5_UNORM:
+    case SVGA3D_ATI1:
+    case SVGA3D_ATI2:
         /* Unknown; only in DX10 & 11 */
         break;
@@ -4479 +4479 @@
         case SVGA3D_RS_CLIPPLANEENABLE:        /* SVGA3dClipPlanes */
         {
-            AssertCompile(SVGA3D_CLIPPLANE_MAX == (1 << 5));
-            for (uint32_t j = 0; j <= 5; j++)
+            for (uint32_t j = 0; j < SVGA3D_NUM_CLIPPLANES; j++)
             {
                 if (pRenderState[i].uintValue & RT_BIT(j))
@@ -4528 +4527 @@
 
             enableCap = GL_FOG_MODE;
-            switch (mode.s.function)
+            switch (mode.function)
             {
             case SVGA3D_FOGFUNC_EXP:
@@ -4540 +4539 @@
                 break;
             default:
-                AssertMsgFailedReturn(("Unexpected fog function %d\n", mode.s.function), VERR_INTERNAL_ERROR);
+                AssertMsgFailedReturn(("Unexpected fog function %d\n", mode.function), VERR_INTERNAL_ERROR);
                 break;
             }
 
             /** @todo how to switch between vertex and pixel fog modes??? */
-            Assert(mode.s.type == SVGA3D_FOGTYPE_PIXEL);
+            Assert(mode.type == SVGA3D_FOGTYPE_PIXEL);
 #if 0
             /* The fog type determines the render state. */
-            switch (mode.s.type)
+            switch (mode.type)
             {
             case SVGA3D_FOGTYPE_VERTEX:
@@ -4557 +4556 @@
                 break;
             default:
-                AssertMsgFailedReturn(("Unexpected fog type %d\n", mode.s.type), VERR_INTERNAL_ERROR);
+                AssertMsgFailedReturn(("Unexpected fog type %d\n", mode.type), VERR_INTERNAL_ERROR);
                 break;
             }
@@ -4563 +4562 @@
 
             /* Set the fog base to depth or range. */
-            switch (mode.s.base)
+            switch (mode.base)
             {
             case SVGA3D_FOGBASE_DEPTHBASED:
@@ -4575 +4574 @@
             default:
                 /* ignore */
-                AssertMsgFailed(("Unexpected fog base %d\n", mode.s.base));
+                AssertMsgFailed(("Unexpected fog base %d\n", mode.base));
                 break;
             }
@@ -4587 +4586 @@
             mode.uintValue = pRenderState[i].uintValue;
 
-            switch (mode.s.mode)
+            switch (mode.mode)
             {
             case SVGA3D_FILLMODE_POINT:
@@ -4599 +4598 @@
                 break;
             default:
-                AssertMsgFailedReturn(("Unexpected fill mode %d\n", mode.s.mode), VERR_INTERNAL_ERROR);
+                AssertMsgFailedReturn(("Unexpected fill mode %d\n", mode.mode), VERR_INTERNAL_ERROR);
                 break;
             }
             /* Only front and back faces. Also recent Mesa guest drivers initialize the 'face' to zero. */
-            ASSERT_GUEST(mode.s.face == SVGA3D_FACE_FRONT_BACK || mode.s.face == SVGA3D_FACE_INVALID);
+            ASSERT_GUEST(mode.face == SVGA3D_FACE_FRONT_BACK || mode.face == SVGA3D_FACE_INVALID);
             glPolygonMode(GL_FRONT_AND_BACK, val);
             VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
@@ -4639 +4638 @@
             break;
 
-        case SVGA3D_RS_LINEAA:                 /* SVGA3dBool */
+        case SVGA3D_RS_ANTIALIASEDLINEENABLE:  /* SVGA3dBool */
             enableCap = GL_LINE_SMOOTH;
             val = pRenderState[i].uintValue;
@@ -5042 +5041 @@
             mask.uintValue = pRenderState[i].uintValue;
 
-            red     = mask.s.red;
-            green   = mask.s.green;
-            blue    = mask.s.blue;
-            alpha   = mask.s.alpha;
+            red     = mask.red;
+            green   = mask.green;
+            blue    = mask.blue;
+            alpha   = mask.alpha;
 
             glColorMask(red, green, blue, alpha);
@@ -5115 +5114 @@
 
         case SVGA3D_RS_MULTISAMPLEMASK:        /* uint32_t */
-        case SVGA3D_RS_ANTIALIASEDLINEENABLE:  /* SVGA3dBool */
             Log(("vmsvga3dSetRenderState: WARNING not applicable??!!\n"));
             break;
@@ -6204 +6202 @@
 
     Log(("vmsvga3dSetClipPlane cid=%u %d (%d,%d)(%d,%d)\n", cid, index, (unsigned)(plane[0] * 100.0), (unsigned)(plane[1] * 100.0), (unsigned)(plane[2] * 100.0), (unsigned)(plane[3] * 100.0)));
-    AssertReturn(index < SVGA3D_CLIPPLANE_MAX, VERR_INVALID_PARAMETER);
+    AssertReturn(index < SVGA3D_NUM_CLIPPLANES, VERR_INVALID_PARAMETER);
 
     PVMSVGA3DCONTEXT pContext;
@@ -6806 +6804 @@
                 VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
 
-                GLuint divisor = paVertexDivisors && paVertexDivisors[index].s.instanceData ? 1 : 0;
+                GLuint divisor = paVertexDivisors && paVertexDivisors[index].instanceData ? 1 : 0;
                 pState->ext.glVertexAttribDivisor(index, divisor);
                 VMSVGA3D_CHECK_LAST_ERROR(pState, pContext);
@@ -7070 +7068 @@
     for (uint32_t iVertexDivisor = 0; iVertexDivisor < cVertexDivisor; ++iVertexDivisor)
     {
-        if (pVertexDivisor[iVertexDivisor].s.indexedData)
+        if (pVertexDivisor[iVertexDivisor].indexedData)
         {
             if (cInstances == 0)
-                cInstances = pVertexDivisor[iVertexDivisor].s.count;
+                cInstances = pVertexDivisor[iVertexDivisor].count;
             else
-                Assert(cInstances == pVertexDivisor[iVertexDivisor].s.count);
-        }
-        else if (pVertexDivisor[iVertexDivisor].s.instanceData)
-        {
-            Assert(pVertexDivisor[iVertexDivisor].s.count == 1);
+                Assert(cInstances == pVertexDivisor[iVertexDivisor].count);
+        }
+        else if (pVertexDivisor[iVertexDivisor].instanceData)
+        {
+            Assert(pVertexDivisor[iVertexDivisor].count == 1);
         }
     }
@@ -7583 +7581 @@
                 Log(("ConstantB %d: value=%d, %d, %d, %d\n", reg + i, pValues[i*4 + 0], pValues[i*4 + 1], pValues[i*4 + 2], pValues[i*4 + 3]));
                 break;
+
+            default:
+                AssertFailedReturn(VERR_INVALID_PARAMETER);
         }
 #endif