Changeset 86009 in vbox for trunk/src/VBox

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

140205

Message:

Devices/Graphics: Use current VMSVGA headers

Location:

trunk/src/VBox/Devices

Files:

• Config.kmk (modified) (1 diff)
• Graphics/DevVGA-SVGA.cpp (modified) (48 diffs)
• Graphics/DevVGA-SVGA.h (modified) (1 diff)
• Graphics/DevVGA-SVGA3d-hlp.cpp (modified) (7 diffs)
• Graphics/DevVGA-SVGA3d-info.cpp (modified) (8 diffs)
• Graphics/DevVGA-SVGA3d-internal.h (modified) (2 diffs)
• Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (19 diffs)
• Graphics/DevVGA-SVGA3d-shared.cpp (modified) (2 diffs)
• Graphics/DevVGA-SVGA3d-win.cpp (modified) (14 diffs)
• Graphics/DevVGA-SVGA3d.cpp (modified) (4 diffs)
• Graphics/DevVGA-SVGA3d.h (modified) (2 diffs)
• Makefile.kmk (modified) (2 diffs)
• testcase/Makefile.kmk (modified) (1 diff)

trunk/src/VBox/Devices/Config.kmk

@@ -26 +26 @@
 ifndef VBOX_VMM_CONFIG_KMK_INCLUDED
  include $(PATH_ROOT)/src/VBox/VMM/Config.kmk
+endif
+
+# We need the Additions/3D/Config.kmk for the VBOX_PATH_VMSVGA_INC variable.
+ifndef VBOX_MESA3D_CONFIG_KMK_INCLUDED
+ include $(PATH_ROOT)/src/VBox/Additions/3D/Config.kmk
 endif
 

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp

@@ -162 +162 @@
 
 #include "DevVGA-SVGA.h"
-#include "vmsvga/svga_escape.h"
-#include "vmsvga/svga_overlay.h"
-#include "vmsvga/svga3d_caps.h"
 #ifdef VBOX_WITH_VMSVGA3D
 # include "DevVGA-SVGA3d.h"
@@ -2571 +2568 @@
         Log(("vmsvgaFIFOAccess [0x%x]: %s SVGA_FIFO_3D_CAPS SVGA3D_DEVCAP_SURFACEFMT_Z_D24S8_INT = %x\n", GCPhysOffset >> 2, (fWriteAccess) ? "WRITE" : "READ", pFIFO[GCPhysOffset >> 2]));
         break;
-    case SVGA_FIFO_3D_CAPS + SVGA3D_DEVCAP_SURFACEFMT_BC4_UNORM:
-        Log(("vmsvgaFIFOAccess [0x%x]: %s SVGA_FIFO_3D_CAPS SVGA3D_DEVCAP_SURFACEFMT_BC4_UNORM = %x\n", GCPhysOffset >> 2, (fWriteAccess) ? "WRITE" : "READ", pFIFO[GCPhysOffset >> 2]));
-        break;
-    case SVGA_FIFO_3D_CAPS + SVGA3D_DEVCAP_SURFACEFMT_BC5_UNORM:
-        Log(("vmsvgaFIFOAccess [0x%x]: %s SVGA_FIFO_3D_CAPS SVGA3D_DEVCAP_SURFACEFMT_BC5_UNORM = %x\n", GCPhysOffset >> 2, (fWriteAccess) ? "WRITE" : "READ", pFIFO[GCPhysOffset >> 2]));
+    case SVGA_FIFO_3D_CAPS + SVGA3D_DEVCAP_SURFACEFMT_ATI1:
+        Log(("vmsvgaFIFOAccess [0x%x]: %s SVGA_FIFO_3D_CAPS SVGA3D_DEVCAP_SURFACEFMT_ATI1 = %x\n", GCPhysOffset >> 2, (fWriteAccess) ? "WRITE" : "READ", pFIFO[GCPhysOffset >> 2]));
+        break;
+    case SVGA_FIFO_3D_CAPS + SVGA3D_DEVCAP_SURFACEFMT_ATI2:
+        Log(("vmsvgaFIFOAccess [0x%x]: %s SVGA_FIFO_3D_CAPS SVGA3D_DEVCAP_SURFACEFMT_ATI2 = %x\n", GCPhysOffset >> 2, (fWriteAccess) ? "WRITE" : "READ", pFIFO[GCPhysOffset >> 2]));
         break;
     case SVGA_FIFO_3D_CAPS_LAST:
@@ -3917 +3914 @@
              * Process the command.
              */
-            SVGAFifoCmdId const enmCmdId = (SVGAFifoCmdId)pFIFO[offCurrentCmd / sizeof(uint32_t)];
+            /* 'enmCmdId' is actually a SVGAFifoCmdId. It is treated as uint32_t in order to avoid a compiler
+             * warning. Because we support some obsolete and deprecated commands, which are not included in
+             * the SVGAFifoCmdId enum in the VMSVGA headers anymore.
+             */
+            uint32_t const enmCmdId = pFIFO[offCurrentCmd / sizeof(uint32_t)];
             RT_UNTRUSTED_NONVOLATILE_COPY_FENCE();
             LogFlow(("vmsvgaR3FifoLoop: FIFO command (iCmd=0x%x) %s 0x%x\n",
@@ -4497 +4498 @@
                 STAM_REL_COUNTER_INC(&pSVGAState->StatR3CmdDefineGmrFb);
 
-                Log(("vmsvgaR3FifoLoop: SVGA_CMD_DEFINE_GMRFB gmr=%x offset=%x bytesPerLine=%x bpp=%d color depth=%d\n", pCmd->ptr.gmrId, pCmd->ptr.offset, pCmd->bytesPerLine, pCmd->format.s.bitsPerPixel, pCmd->format.s.colorDepth));
+                Log(("vmsvgaR3FifoLoop: SVGA_CMD_DEFINE_GMRFB gmr=%x offset=%x bytesPerLine=%x bpp=%d color depth=%d\n", pCmd->ptr.gmrId, pCmd->ptr.offset, pCmd->bytesPerLine, pCmd->format.bitsPerPixel, pCmd->format.colorDepth));
                 pSVGAState->GMRFB.ptr          = pCmd->ptr;
                 pSVGAState->GMRFB.bytesPerLine = pCmd->bytesPerLine;
@@ -4520 +4521 @@
 
                 /** @todo Support GMRFB.format.s.bitsPerPixel != pThis->svga.uBpp   */
-                AssertBreak(pSVGAState->GMRFB.format.s.bitsPerPixel == pScreen->cBpp);
+                AssertBreak(pSVGAState->GMRFB.format.bitsPerPixel == pScreen->cBpp);
 
                 /* Clip destRect to the screen dimensions. */
@@ -4562 +4563 @@
                 /* Source: GMRFB. vmsvgaR3GmrTransfer ensures that no memory outside the GMR is read. */
                 SVGAGuestPtr const gstPtr = pSVGAState->GMRFB.ptr;
-                uint32_t const offGst =  (srcx * RT_ALIGN(pSVGAState->GMRFB.format.s.bitsPerPixel, 8)) / 8
+                uint32_t const offGst =  (srcx * RT_ALIGN(pSVGAState->GMRFB.format.bitsPerPixel, 8)) / 8
                                        + pSVGAState->GMRFB.bytesPerLine * srcy;
                 int32_t const cbGstPitch = pSVGAState->GMRFB.bytesPerLine;
@@ -4591 +4592 @@
                 AssertPtrBreak(pScreen);
 
-                /** @todo Support GMRFB.format.s.bitsPerPixel != pThis->svga.uBpp?   */
-                AssertBreak(pSVGAState->GMRFB.format.s.bitsPerPixel == pScreen->cBpp);
+                /** @todo Support GMRFB.format.bitsPerPixel != pThis->svga.uBpp?   */
+                AssertBreak(pSVGAState->GMRFB.format.bitsPerPixel == pScreen->cBpp);
 
                 /* Clip destRect to the screen dimensions. */
@@ -4634 +4635 @@
                 /* Destination: GMRFB. vmsvgaR3GmrTransfer ensures that no memory outside the GMR is read. */
                 SVGAGuestPtr const gstPtr = pSVGAState->GMRFB.ptr;
-                uint32_t const offGst =  (dstx * RT_ALIGN(pSVGAState->GMRFB.format.s.bitsPerPixel, 8)) / 8
+                uint32_t const offGst =  (dstx * RT_ALIGN(pSVGAState->GMRFB.format.bitsPerPixel, 8)) / 8
                                        + pSVGAState->GMRFB.bytesPerLine * dsty;
                 int32_t const cbGstPitch = pSVGAState->GMRFB.bytesPerLine;
@@ -4652 +4653 @@
                 STAM_REL_COUNTER_INC(&pSVGAState->StatR3CmdAnnotationFill);
 
-                Log(("vmsvgaR3FifoLoop: SVGA_CMD_ANNOTATION_FILL red=%x green=%x blue=%x\n", pCmd->color.s.r, pCmd->color.s.g, pCmd->color.s.b));
+                Log(("vmsvgaR3FifoLoop: SVGA_CMD_ANNOTATION_FILL red=%x green=%x blue=%x\n", pCmd->color.r, pCmd->color.g, pCmd->color.b));
                 pSVGAState->colorAnnotation = pCmd->color;
                 break;
@@ -4675 +4676 @@
                     RT_UNTRUSTED_VALIDATED_FENCE();
 
-                    /* All 3d commands start with a common header, which defines the size of the command. */
-                    SVGA3dCmdHeader *pHdr;
-                    VMSVGAFIFO_GET_CMD_BUFFER_BREAK(pHdr, SVGA3dCmdHeader, sizeof(*pHdr));
-                    AssertBreak(pHdr->size < pThis->svga.cbFIFO);
-                    uint32_t cbCmd = sizeof(SVGA3dCmdHeader) + pHdr->size;
-                    VMSVGAFIFO_GET_MORE_CMD_BUFFER_BREAK(pHdr, SVGA3dCmdHeader, cbCmd);
+                    /* All 3d commands start with a common header, which defines the identifier and the size
+                     * of the command. The identifier has been already read from FIFO. Fetch the size.
+                     */
+                    uint32_t *pcbCmd;
+                    VMSVGAFIFO_GET_CMD_BUFFER_BREAK(pcbCmd, uint32_t, sizeof(*pcbCmd));
+                    uint32_t const cbCmd = *pcbCmd;
+                    AssertBreak(cbCmd < pThis->svga.cbFIFO);
+                    uint32_t *pu32Cmd;
+                    VMSVGAFIFO_GET_MORE_CMD_BUFFER_BREAK(pu32Cmd, uint32_t, sizeof(*pcbCmd) + cbCmd);
+                    pu32Cmd++; /* Skip the command size. */
 
                     if (RT_LIKELY(pThis->svga.f3DEnabled))
@@ -4696 +4701 @@
 #  define VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(a_cbMin) \
      if (1) { \
-          AssertMsgBreak(pHdr->size >= (a_cbMin), ("size=%#x a_cbMin=%#zx\n", pHdr->size, (size_t)(a_cbMin))); \
+          AssertMsgBreak(cbCmd >= (a_cbMin), ("size=%#x a_cbMin=%#zx\n", cbCmd, (size_t)(a_cbMin))); \
           RT_UNTRUSTED_VALIDATED_FENCE(); \
      } else do {} while (0)
@@ -4704 +4709 @@
                     {
                         uint32_t                cMipLevels;
-                        SVGA3dCmdDefineSurface *pCmd = (SVGA3dCmdDefineSurface *)(pHdr + 1);
+                        SVGA3dCmdDefineSurface *pCmd = (SVGA3dCmdDefineSurface *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSurfaceDefine);
 
-                        cMipLevels = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGA3dSize);
+                        cMipLevels = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dSize);
                         rc = vmsvga3dSurfaceDefine(pThisCC, pCmd->sid, (uint32_t)pCmd->surfaceFlags, pCmd->format, pCmd->face, 0,
                                                    SVGA3D_TEX_FILTER_NONE, cMipLevels, (SVGA3dSize *)(pCmd + 1));
@@ -4720 +4725 @@
                     {
                         uint32_t                   cMipLevels;
-                        SVGA3dCmdDefineSurface_v2 *pCmd = (SVGA3dCmdDefineSurface_v2 *)(pHdr + 1);
+                        SVGA3dCmdDefineSurface_v2 *pCmd = (SVGA3dCmdDefineSurface_v2 *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSurfaceDefineV2);
 
-                        cMipLevels = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGA3dSize);
+                        cMipLevels = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dSize);
                         rc = vmsvga3dSurfaceDefine(pThisCC, pCmd->sid, pCmd->surfaceFlags, pCmd->format, pCmd->face,
                                                    pCmd->multisampleCount, pCmd->autogenFilter,
@@ -4733 +4738 @@
                     case SVGA_3D_CMD_SURFACE_DESTROY:
                     {
-                        SVGA3dCmdDestroySurface *pCmd = (SVGA3dCmdDestroySurface *)(pHdr + 1);
+                        SVGA3dCmdDestroySurface *pCmd = (SVGA3dCmdDestroySurface *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSurfaceDestroy);
@@ -4743 +4748 @@
                     {
                         uint32_t              cCopyBoxes;
-                        SVGA3dCmdSurfaceCopy *pCmd = (SVGA3dCmdSurfaceCopy *)(pHdr + 1);
+                        SVGA3dCmdSurfaceCopy *pCmd = (SVGA3dCmdSurfaceCopy *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSurfaceCopy);
 
-                        cCopyBoxes = (pHdr->size - sizeof(pCmd)) / sizeof(SVGA3dCopyBox);
+                        cCopyBoxes = (cbCmd - sizeof(pCmd)) / sizeof(SVGA3dCopyBox);
                         rc = vmsvga3dSurfaceCopy(pThisCC, pCmd->dest, pCmd->src, cCopyBoxes, (SVGA3dCopyBox *)(pCmd + 1));
                         break;
@@ -4754 +4759 @@
                     case SVGA_3D_CMD_SURFACE_STRETCHBLT:
                     {
-                        SVGA3dCmdSurfaceStretchBlt *pCmd = (SVGA3dCmdSurfaceStretchBlt *)(pHdr + 1);
+                        SVGA3dCmdSurfaceStretchBlt *pCmd = (SVGA3dCmdSurfaceStretchBlt *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSurfaceStretchBlt);
@@ -4766 +4771 @@
                     {
                         uint32_t             cCopyBoxes;
-                        SVGA3dCmdSurfaceDMA *pCmd = (SVGA3dCmdSurfaceDMA *)(pHdr + 1);
+                        SVGA3dCmdSurfaceDMA *pCmd = (SVGA3dCmdSurfaceDMA *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSurfaceDma);
@@ -4773 +4778 @@
                         if (LogRelIs3Enabled())
                             u64NanoTS = RTTimeNanoTS();
-                        cCopyBoxes = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGA3dCopyBox);
+                        cCopyBoxes = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dCopyBox);
                         STAM_PROFILE_START(&pSVGAState->StatR3Cmd3dSurfaceDmaProf, a);
                         rc = vmsvga3dSurfaceDMA(pThis, pThisCC, pCmd->guest, pCmd->host, pCmd->transfer,
@@ -4795 +4800 @@
                     {
                         uint32_t                      cRects;
-                        SVGA3dCmdBlitSurfaceToScreen *pCmd = (SVGA3dCmdBlitSurfaceToScreen *)(pHdr + 1);
+                        SVGA3dCmdBlitSurfaceToScreen *pCmd = (SVGA3dCmdBlitSurfaceToScreen *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSurfaceScreen);
@@ -4805 +4810 @@
                         if (LogRelIs3Enabled())
                             u64NanoTS = RTTimeNanoTS();
-                        cRects = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGASignedRect);
+                        cRects = (cbCmd - sizeof(*pCmd)) / sizeof(SVGASignedRect);
                         STAM_REL_PROFILE_START(&pSVGAState->StatR3Cmd3dBlitSurfaceToScreenProf, a);
                         rc = vmsvga3dSurfaceBlitToScreen(pThis, pThisCC, pCmd->destScreenId, pCmd->destRect, pCmd->srcImage,
@@ -4836 +4841 @@
                     case SVGA_3D_CMD_CONTEXT_DEFINE:
                     {
-                        SVGA3dCmdDefineContext *pCmd = (SVGA3dCmdDefineContext *)(pHdr + 1);
+                        SVGA3dCmdDefineContext *pCmd = (SVGA3dCmdDefineContext *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dContextDefine);
@@ -4846 +4851 @@
                     case SVGA_3D_CMD_CONTEXT_DESTROY:
                     {
-                        SVGA3dCmdDestroyContext *pCmd = (SVGA3dCmdDestroyContext *)(pHdr + 1);
+                        SVGA3dCmdDestroyContext *pCmd = (SVGA3dCmdDestroyContext *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dContextDestroy);
@@ -4856 +4861 @@
                     case SVGA_3D_CMD_SETTRANSFORM:
                     {
-                        SVGA3dCmdSetTransform *pCmd = (SVGA3dCmdSetTransform *)(pHdr + 1);
+                        SVGA3dCmdSetTransform *pCmd = (SVGA3dCmdSetTransform *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetTransform);
@@ -4866 +4871 @@
                     case SVGA_3D_CMD_SETZRANGE:
                     {
-                        SVGA3dCmdSetZRange *pCmd = (SVGA3dCmdSetZRange *)(pHdr + 1);
+                        SVGA3dCmdSetZRange *pCmd = (SVGA3dCmdSetZRange *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetZRange);
@@ -4877 +4882 @@
                     {
                         uint32_t                 cRenderStates;
-                        SVGA3dCmdSetRenderState *pCmd = (SVGA3dCmdSetRenderState *)(pHdr + 1);
+                        SVGA3dCmdSetRenderState *pCmd = (SVGA3dCmdSetRenderState *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetRenderState);
 
-                        cRenderStates = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGA3dRenderState);
+                        cRenderStates = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dRenderState);
                         rc = vmsvga3dSetRenderState(pThisCC, pCmd->cid, cRenderStates, (SVGA3dRenderState *)(pCmd + 1));
                         break;
@@ -4888 +4893 @@
                     case SVGA_3D_CMD_SETRENDERTARGET:
                     {
-                        SVGA3dCmdSetRenderTarget *pCmd = (SVGA3dCmdSetRenderTarget *)(pHdr + 1);
+                        SVGA3dCmdSetRenderTarget *pCmd = (SVGA3dCmdSetRenderTarget *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetRenderTarget);
@@ -4899 +4904 @@
                     {
                         uint32_t                  cTextureStates;
-                        SVGA3dCmdSetTextureState *pCmd = (SVGA3dCmdSetTextureState *)(pHdr + 1);
+                        SVGA3dCmdSetTextureState *pCmd = (SVGA3dCmdSetTextureState *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetTextureState);
 
-                        cTextureStates = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGA3dTextureState);
+                        cTextureStates = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dTextureState);
                         rc = vmsvga3dSetTextureState(pThisCC, pCmd->cid, cTextureStates, (SVGA3dTextureState *)(pCmd + 1));
                         break;
@@ -4910 +4915 @@
                     case SVGA_3D_CMD_SETMATERIAL:
                     {
-                        SVGA3dCmdSetMaterial *pCmd = (SVGA3dCmdSetMaterial *)(pHdr + 1);
+                        SVGA3dCmdSetMaterial *pCmd = (SVGA3dCmdSetMaterial *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetMaterial);
@@ -4920 +4925 @@
                     case SVGA_3D_CMD_SETLIGHTDATA:
                     {
-                        SVGA3dCmdSetLightData *pCmd = (SVGA3dCmdSetLightData *)(pHdr + 1);
+                        SVGA3dCmdSetLightData *pCmd = (SVGA3dCmdSetLightData *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetLightData);
@@ -4930 +4935 @@
                     case SVGA_3D_CMD_SETLIGHTENABLED:
                     {
-                        SVGA3dCmdSetLightEnabled *pCmd = (SVGA3dCmdSetLightEnabled *)(pHdr + 1);
+                        SVGA3dCmdSetLightEnabled *pCmd = (SVGA3dCmdSetLightEnabled *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetLightEnable);
@@ -4940 +4945 @@
                     case SVGA_3D_CMD_SETVIEWPORT:
                     {
-                        SVGA3dCmdSetViewport *pCmd = (SVGA3dCmdSetViewport *)(pHdr + 1);
+                        SVGA3dCmdSetViewport *pCmd = (SVGA3dCmdSetViewport *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetViewPort);
@@ -4950 +4955 @@
                     case SVGA_3D_CMD_SETCLIPPLANE:
                     {
-                        SVGA3dCmdSetClipPlane *pCmd = (SVGA3dCmdSetClipPlane *)(pHdr + 1);
+                        SVGA3dCmdSetClipPlane *pCmd = (SVGA3dCmdSetClipPlane *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetClipPlane);
@@ -4960 +4965 @@
                     case SVGA_3D_CMD_CLEAR:
                     {
-                        SVGA3dCmdClear  *pCmd = (SVGA3dCmdClear *)(pHdr + 1);
+                        SVGA3dCmdClear  *pCmd = (SVGA3dCmdClear *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dClear);
 
-                        uint32_t cRects = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGA3dRect);
+                        uint32_t cRects = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dRect);
                         rc = vmsvga3dCommandClear(pThisCC, pCmd->cid, pCmd->clearFlag, pCmd->color, pCmd->depth, pCmd->stencil, cRects, (SVGA3dRect *)(pCmd + 1));
                         break;
@@ -4972 +4977 @@
                     case SVGA_3D_CMD_PRESENT_READBACK: /** @todo SVGA_3D_CMD_PRESENT_READBACK isn't quite the same as present... */
                     {
-                        SVGA3dCmdPresent *pCmd = (SVGA3dCmdPresent *)(pHdr + 1);
+                        SVGA3dCmdPresent *pCmd = (SVGA3dCmdPresent *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         if ((unsigned)enmCmdId == SVGA_3D_CMD_PRESENT)
@@ -4979 +4984 @@
                             STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dPresentReadBack);
 
-                        uint32_t cRects = (pHdr->size - sizeof(*pCmd)) / sizeof(SVGA3dCopyRect);
+                        uint32_t cRects = (cbCmd - sizeof(*pCmd)) / sizeof(SVGA3dCopyRect);
 
                         STAM_PROFILE_START(&pSVGAState->StatR3Cmd3dPresentProf, a);
@@ -4989 +4994 @@
                     case SVGA_3D_CMD_SHADER_DEFINE:
                     {
-                        SVGA3dCmdDefineShader *pCmd = (SVGA3dCmdDefineShader *)(pHdr + 1);
+                        SVGA3dCmdDefineShader *pCmd = (SVGA3dCmdDefineShader *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dShaderDefine);
 
-                        uint32_t cbData = (pHdr->size - sizeof(*pCmd));
+                        uint32_t cbData = (cbCmd - sizeof(*pCmd));
                         rc = vmsvga3dShaderDefine(pThisCC, pCmd->cid, pCmd->shid, pCmd->type, cbData, (uint32_t *)(pCmd + 1));
                         break;
@@ -5000 +5005 @@
                     case SVGA_3D_CMD_SHADER_DESTROY:
                     {
-                        SVGA3dCmdDestroyShader *pCmd = (SVGA3dCmdDestroyShader *)(pHdr + 1);
+                        SVGA3dCmdDestroyShader *pCmd = (SVGA3dCmdDestroyShader *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dShaderDestroy);
@@ -5010 +5015 @@
                     case SVGA_3D_CMD_SET_SHADER:
                     {
-                        SVGA3dCmdSetShader *pCmd = (SVGA3dCmdSetShader *)(pHdr + 1);
+                        SVGA3dCmdSetShader *pCmd = (SVGA3dCmdSetShader *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetShader);
@@ -5020 +5025 @@
                     case SVGA_3D_CMD_SET_SHADER_CONST:
                     {
-                        SVGA3dCmdSetShaderConst *pCmd = (SVGA3dCmdSetShaderConst *)(pHdr + 1);
+                        SVGA3dCmdSetShaderConst *pCmd = (SVGA3dCmdSetShaderConst *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetShaderConst);
 
-                        uint32_t cRegisters = (pHdr->size - sizeof(*pCmd)) / sizeof(pCmd->values) + 1;
+                        uint32_t cRegisters = (cbCmd - sizeof(*pCmd)) / sizeof(pCmd->values) + 1;
                         rc = vmsvga3dShaderSetConst(pThisCC, pCmd->cid, pCmd->reg, pCmd->type, pCmd->ctype, cRegisters, pCmd->values);
                         break;
@@ -5031 +5036 @@
                     case SVGA_3D_CMD_DRAW_PRIMITIVES:
                     {
-                        SVGA3dCmdDrawPrimitives *pCmd = (SVGA3dCmdDrawPrimitives *)(pHdr + 1);
+                        SVGA3dCmdDrawPrimitives *pCmd = (SVGA3dCmdDrawPrimitives *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dDrawPrimitives);
@@ -5039 +5044 @@
                         uint32_t const cbRangesAndVertexDecls = pCmd->numVertexDecls * sizeof(SVGA3dVertexDecl)
                                                               + pCmd->numRanges * sizeof(SVGA3dPrimitiveRange);
-                        ASSERT_GUEST_BREAK(cbRangesAndVertexDecls <= pHdr->size - sizeof(*pCmd));
-
-                        uint32_t cVertexDivisor = (pHdr->size - sizeof(*pCmd) - cbRangesAndVertexDecls) / sizeof(uint32_t);
+                        ASSERT_GUEST_BREAK(cbRangesAndVertexDecls <= cbCmd - sizeof(*pCmd));
+
+                        uint32_t cVertexDivisor = (cbCmd - sizeof(*pCmd) - cbRangesAndVertexDecls) / sizeof(uint32_t);
                         AssertBreak(!cVertexDivisor || cVertexDivisor == pCmd->numVertexDecls);
 
@@ -5059 +5064 @@
                     case SVGA_3D_CMD_SETSCISSORRECT:
                     {
-                        SVGA3dCmdSetScissorRect *pCmd = (SVGA3dCmdSetScissorRect *)(pHdr + 1);
+                        SVGA3dCmdSetScissorRect *pCmd = (SVGA3dCmdSetScissorRect *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dSetScissorRect);
@@ -5069 +5074 @@
                     case SVGA_3D_CMD_BEGIN_QUERY:
                     {
-                        SVGA3dCmdBeginQuery *pCmd = (SVGA3dCmdBeginQuery *)(pHdr + 1);
+                        SVGA3dCmdBeginQuery *pCmd = (SVGA3dCmdBeginQuery *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dBeginQuery);
@@ -5079 +5084 @@
                     case SVGA_3D_CMD_END_QUERY:
                     {
-                        SVGA3dCmdEndQuery *pCmd = (SVGA3dCmdEndQuery *)(pHdr + 1);
+                        SVGA3dCmdEndQuery *pCmd = (SVGA3dCmdEndQuery *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dEndQuery);
@@ -5089 +5094 @@
                     case SVGA_3D_CMD_WAIT_FOR_QUERY:
                     {
-                        SVGA3dCmdWaitForQuery *pCmd = (SVGA3dCmdWaitForQuery *)(pHdr + 1);
+                        SVGA3dCmdWaitForQuery *pCmd = (SVGA3dCmdWaitForQuery *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dWaitForQuery);
@@ -5099 +5104 @@
                     case SVGA_3D_CMD_GENERATE_MIPMAPS:
                     {
-                        SVGA3dCmdGenerateMipmaps *pCmd = (SVGA3dCmdGenerateMipmaps *)(pHdr + 1);
+                        SVGA3dCmdGenerateMipmaps *pCmd = (SVGA3dCmdGenerateMipmaps *)pu32Cmd;
                         VMSVGAFIFO_CHECK_3D_CMD_MIN_SIZE_BREAK(sizeof(*pCmd));
                         STAM_REL_COUNTER_INC(&pSVGAState->StatR3Cmd3dGenerateMipmaps);
@@ -6419 +6424 @@
     "xSURFACEFMT_Z_DF24",
     "xSURFACEFMT_Z_D24S8_INT",
-    "xSURFACEFMT_BC4_UNORM",
-    "xSURFACEFMT_BC5_UNORM", /* 83 */
+    "xSURFACEFMT_ATI1",
+    "xSURFACEFMT_ATI2", /* 83 */
 };
 
@@ -6447 +6452 @@
 
     /* Fill out all 3d capabilities. */
-    for (unsigned i = 0; i < SVGA3D_DEVCAP_MAX; i++)
+    /** @todo The current implementation stores the capabilities in the FIFO.
+     * Newer VMSVGA uses SVGA_REG_DEV_CAP register to query 3d caps.
+     * Prerequisite for the new interface is support for SVGA_CAP_GBOBJECTS.
+     */
+    AssertCompile(SVGA3D_DEVCAP_DEAD1 == SVGA3D_DEVCAP_SURFACEFMT_ATI2 + 1);
+    for (unsigned i = 0; i < SVGA3D_DEVCAP_DEAD1; i++)
     {
         uint32_t val = 0;

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.h

@@ -25 +25 @@
 #endif
 
+#include <VBox/pci.h>
+#include <VBox/vmm/pdmifs.h>
 #include <VBox/vmm/pdmthread.h>
-
-#include "vmsvga/svga3d_reg.h"
+#include <VBox/vmm/stam.h>
+
+/*
+ * PCI device IDs.
+ */
+#ifndef PCI_VENDOR_ID_VMWARE
+# define PCI_VENDOR_ID_VMWARE            0x15AD
+#endif
+#ifndef PCI_DEVICE_ID_VMWARE_SVGA2
+# define PCI_DEVICE_ID_VMWARE_SVGA2      0x0405
+#endif
+
+/* For "svga_overlay.h" */
+#ifndef TRUE
+# define TRUE 1
+#endif
+#ifndef FALSE
+# define FALSE 0
+#endif
+
+#include <svga3d_caps.h>
+#include <svga3d_reg.h>
+#include <svga3d_shaderdefs.h>
+#include <svga_escape.h>
+#include <svga_overlay.h>
+
+/* Deprecated. */
+#define SVGA_CMD_RECT_FILL             2
+#define SVGA_CMD_DISPLAY_CURSOR        20
+#define SVGA_CMD_MOVE_CURSOR           21
+
+/*
+ * SVGA_CMD_RECT_FILL --
+ *
+ *    Fill a rectangular area in the the GFB, and copy the result
+ *    to any screens which intersect it.
+ *
+ *    Deprecated?
+ *
+ * Availability:
+ *    SVGA_CAP_RECT_FILL
+ */
+
+typedef
+struct {
+   uint32_t pixel;
+   uint32_t destX;
+   uint32_t destY;
+   uint32_t width;
+   uint32_t height;
+} SVGAFifoCmdRectFill;
+
+/*
+ * SVGA_CMD_DISPLAY_CURSOR --
+ *
+ *    Turn the cursor on or off.
+ *
+ *    Deprecated.
+ *
+ * Availability:
+ *    SVGA_CAP_CURSOR?
+ */
+
+typedef
+struct {
+   uint32_t id;             // Reserved, must be zero.
+   uint32_t state;          // 0=off
+} SVGAFifoCmdDisplayCursor;
+
+/*
+ * SVGA_CMD_MOVE_CURSOR --
+ *
+ *    Set the cursor position.
+ *
+ *    Deprecated.
+ *
+ * Availability:
+ *    SVGA_CAP_CURSOR?
+ */
+
+typedef
+struct {
+    SVGASignedPoint     pos;
+} SVGAFifoCmdMoveCursor;
+
 
 /** Default FIFO size. */

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

@@ -24 +24 @@
 #include <iprt/types.h>
 
-#include "vmsvga/svga3d_reg.h"
-#include "vmsvga/svga3d_shaderdefs.h"
+#include "DevVGA-SVGA.h"
 
 typedef struct VMSVGA3DSHADERPARSECONTEXT
@@ -98 +97 @@
     src.value = *pToken;
 
-    SVGA3dShaderRegType const regType = (SVGA3dShaderRegType)(src.s.type_upper << 3 | src.s.type_lower);
+    SVGA3dShaderRegType const regType = (SVGA3dShaderRegType)(src.type_upper << 3 | src.type_lower);
     Log3(("Src: type %d, r0 %d, srcMod %d, swizzle 0x%x, r1 %d, relAddr %d, num %d\n",
-          regType, src.s.reserved0, src.s.srcMod, src.s.swizzle, src.s.reserved1, src.s.relAddr, src.s.num));
-
-    return vmsvga3dShaderParseRegOffset(pCtx, true, regType, src.s.num);
+          regType, src.reserved0, src.srcMod, src.swizzle, src.reserved1, src.relAddr, src.num));
+
+    return vmsvga3dShaderParseRegOffset(pCtx, true, regType, src.num);
 }
 #endif
@@ -113 +112 @@
     dest.value = *pToken;
 
-    SVGA3dShaderRegType const regType = (SVGA3dShaderRegType)(dest.s.type_upper << 3 | dest.s.type_lower);
+    SVGA3dShaderRegType const regType = (SVGA3dShaderRegType)(dest.type_upper << 3 | dest.type_lower);
     Log3(("Dest: type %d, r0 %d, shfScale %d, dstMod %d, mask 0x%x, r1 %d, relAddr %d, num %d\n",
-          regType, dest.s.reserved0, dest.s.shfScale, dest.s.dstMod, dest.s.mask, dest.s.reserved1, dest.s.relAddr, dest.s.num));
-
-    return vmsvga3dShaderParseRegOffset(pCtx, false, regType, dest.s.num);
+          regType, dest.reserved0, dest.shfScale, dest.dstMod, dest.mask, dest.reserved1, dest.relAddr, dest.num));
+
+    return vmsvga3dShaderParseRegOffset(pCtx, false, regType, dest.num);
 }
 
@@ -126 +125 @@
     a.values[1] = pToken[1]; // dst
 
-    return vmsvga3dShaderParseDestToken(pCtx, (uint32_t *)&a.s2.dst);
+    return vmsvga3dShaderParseDestToken(pCtx, (uint32_t *)&a.dst);
 }
 
@@ -160 +159 @@
     /* "The first token must be a version token." */
     SVGA3dShaderVersion const *pVersion = (SVGA3dShaderVersion const *)paTokensStart;
-    ASSERT_GUEST_RETURN(   pVersion->s.type == SVGA3D_VS_TYPE
-                        || pVersion->s.type == SVGA3D_PS_TYPE, VERR_PARSE_ERROR);
+    ASSERT_GUEST_RETURN(   pVersion->type == SVGA3D_VS_TYPE
+                        || pVersion->type == SVGA3D_PS_TYPE, VERR_PARSE_ERROR);
 
     VMSVGA3DSHADERPARSECONTEXT ctx;
-    ctx.type = pVersion->s.type;
+    ctx.type = pVersion->type;
 
     /* Scan the tokens. Immediately return an error code on any unexpected data. */
@@ -175 +174 @@
         /* Figure out the instruction length, which is how many tokens follow the instruction token. */
         uint32_t cInstLen;
-        if (token.s1.op == SVGA3DOP_COMMENT)
-            cInstLen = token.s.comment_size;
+        if (token.op == SVGA3DOP_COMMENT)
+            cInstLen = token.comment_size;
         else
-            cInstLen = token.s1.size;
-
-        Log3(("op %d, cInstLen %d\n", token.s1.op, cInstLen));
+            cInstLen = token.size;
+
+        Log3(("op %d, cInstLen %d\n", token.op, cInstLen));
 
         ASSERT_GUEST_RETURN(cInstLen < paTokensEnd - pToken, VERR_PARSE_ERROR);
 
-        if (token.s1.op == SVGA3DOP_END)
+        if (token.op == SVGA3DOP_END)
         {
             ASSERT_GUEST_RETURN(token.value == 0x0000FFFF, VERR_PARSE_ERROR);
@@ -191 +190 @@
 
         int rc;
-        switch (token.s1.op)
+        switch (token.op)
         {
             case SVGA3DOP_DCL:

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

@@ -73 +73 @@
     { SVGA3D_BUMPL6V5U5         , "BUMPL6V5U5" },
     { SVGA3D_BUMPX8L8V8U8       , "BUMPX8L8V8U8" },
-    { SVGA3D_BUMPL8V8U8         , "BUMPL8V8U8" },
+    { SVGA3D_FORMAT_DEAD1       , "FORMAT_DEAD1" },
     { SVGA3D_ARGB_S10E5         , "ARGB_S10E5" },
     { SVGA3D_ARGB_S23E8         , "ARGB_S23E8" },
@@ -96 +96 @@
     { SVGA3D_NV12               , "NV12" },
     { SVGA3D_AYUV               , "AYUV" },
-    { SVGA3D_BC4_UNORM          , "BC4_UNORM" },
-    { SVGA3D_BC5_UNORM          , "BC5_UNORM" },
+    { SVGA3D_ATI1               , "ATI1" },
+    { SVGA3D_ATI2               , "ATI2" },
     { SVGA3D_Z_DF16             , "Z_DF16" },
     { SVGA3D_Z_DF24             , "Z_DF24" },
@@ -682 +682 @@
         *pEnumMap->pfAsserted = true;
         for (uint32_t i = 1; i < pEnumMap->cValues; i++)
-            Assert(paValues[i - 1].iValue <= paValues[i].iValue);
+            AssertMsg(paValues[i - 1].iValue <= paValues[i].iValue,
+                      ("i = %d: %d followed by %d", i, paValues[i - 1].iValue, paValues[i].iValue));
     }
 #endif
@@ -1010 +1011 @@
             case SVGA3D_BUMPL6V5U5:
             case SVGA3D_BUMPX8L8V8U8:
-            case SVGA3D_BUMPL8V8U8:
+            case SVGA3D_FORMAT_DEAD1:
             case SVGA3D_ARGB_S10E5:
             case SVGA3D_ARGB_S23E8:
@@ -1028 +1029 @@
             case SVGA3D_NV12:
             case SVGA3D_AYUV:
-            case SVGA3D_BC4_UNORM:
-            case SVGA3D_BC5_UNORM:
+            case SVGA3D_ATI1:
+            case SVGA3D_ATI2:
             case SVGA3D_Z_DF16:
             case SVGA3D_Z_DF24:
@@ -1226 +1227 @@
        "e" "BLENDEQUATIONALPHA",            /*  SVGA3dBlendEquation  */
        "*" "TRANSPARENCYANTIALIAS",         /*  SVGA3dTransparencyAntialiasType  */
-       "f" "LINEAA",                        /*  SVGA3dBool  */
        "r" "LINEWIDTH",                     /*  float  */
     };
@@ -1265 +1265 @@
                 case 'c': //SVGA3dColor, SVGA3dColorMask
                     RTStrPrintf(pszBuffer, cbBuffer, "%s = RGBA(%d,%d,%d,%d) (%#x)", pszName,
-                                uValue.Color.s.red, uValue.Color.s.green, uValue.Color.s.blue, uValue.Color.s.alpha, uValue.u);
+                                uValue.Color.red, uValue.Color.green, uValue.Color.blue, uValue.Color.alpha, uValue.u);
                     break;
                 case 'w': //SVGA3dWrapFlags
@@ -1392 +1392 @@
                 case 'c': //SVGA3dColor, SVGA3dColorMask
                     RTStrPrintf(pszBuffer, cbBuffer, "%s = RGBA(%d,%d,%d,%d) (%#x)", pszName,
-                                uValue.Color.s.red, uValue.Color.s.green, uValue.Color.s.blue, uValue.Color.s.alpha, uValue.u);
+                                uValue.Color.red, uValue.Color.green, uValue.Color.blue, uValue.Color.alpha, uValue.u);
                     break;
 

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

@@ -87 +87 @@
 #endif
 
-#include "vmsvga/svga3d_shaderdefs.h"
 #ifdef VMSVGA3D_OPENGL
 # include "vmsvga_glext/glext.h"
@@ -863 +862 @@
         VMSVGATRANSFORMSTATE    aTransformState[SVGA3D_TRANSFORM_MAX];
         VMSVGAMATERIALSTATE     aMaterial[SVGA3D_FACE_MAX];
-        VMSVGACLIPPLANESTATE    aClipPlane[SVGA3D_CLIPPLANE_MAX];
+        /* The aClipPlane array has a wrong (greater) size. Keep it for now because the array is a part of the saved state. */
+        /** @todo Replace SVGA3D_CLIPPLANE_5 with SVGA3D_NUM_CLIPPLANES and increase the saved state version. */
+        VMSVGACLIPPLANESTATE    aClipPlane[SVGA3D_CLIPPLANE_5];
         VMSVGALIGHTSTATE        aLightData[SVGA3D_MAX_LIGHTS];
 

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

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

@@ -626 +626 @@
     case SVGA3D_DEVCAP_SURFACEFMT_AYUV:
         return "SVGA3D_DEVCAP_SURFACEFMT_AYUV";
-    case SVGA3D_DEVCAP_SURFACEFMT_BC4_UNORM:
-        return "SVGA3D_DEVCAP_SURFACEFMT_BC4_UNORM";
-    case SVGA3D_DEVCAP_SURFACEFMT_BC5_UNORM:
-        return "SVGA3D_DEVCAP_SURFACEFMT_BC5_UNORM";
+    case SVGA3D_DEVCAP_SURFACEFMT_ATI1:
+        return "SVGA3D_DEVCAP_SURFACEFMT_ATI1";
+    case SVGA3D_DEVCAP_SURFACEFMT_ATI2:
+        return "SVGA3D_DEVCAP_SURFACEFMT_ATI2";
     default:
         return "UNEXPECTED";
@@ -888 +888 @@
     case SVGA3D_RS_TRANSPARENCYANTIALIAS:  /* SVGA3dTransparencyAntialiasType */
         return "SVGA3D_RS_TRANSPARENCYANTIALIAS";
-    case SVGA3D_RS_LINEAA:                 /* SVGA3dBool */
-        return "SVGA3D_RS_LINEAA";
     case SVGA3D_RS_LINEWIDTH:              /* float */
         return "SVGA3D_RS_LINEWIDTH";

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

@@ -799 +799 @@
         break;
 
-    case SVGA3D_DEVCAP_SURFACEFMT_BC4_UNORM:
-    case SVGA3D_DEVCAP_SURFACEFMT_BC5_UNORM:
+    case SVGA3D_DEVCAP_SURFACEFMT_ATI1:
+    case SVGA3D_DEVCAP_SURFACEFMT_ATI2:
         /* Unknown; only in DX10 & 11 */
         Log(("CAPS: Unknown CAP %s\n", vmsvga3dGetCapString(idx3dCaps)));
@@ -992 +992 @@
     case SVGA3D_BUMPX8L8V8U8:
         return D3DFMT_X8L8V8U8;
-    case SVGA3D_BUMPL8V8U8:
+    case SVGA3D_FORMAT_DEAD1:
         /* No corresponding D3D9 equivalent. */
         AssertFailedReturn(D3DFMT_UNKNOWN);
@@ -1064 +1064 @@
         return D3DFMT_G16R16;
 
-    case SVGA3D_BC4_UNORM:
-    case SVGA3D_BC5_UNORM:
+    case SVGA3D_ATI1:
+    case SVGA3D_ATI2:
         /* Unknown; only in DX10 & 11 */
         break;
@@ -1071 +1071 @@
     case SVGA3D_FORMAT_MAX:     /* shut up MSC */
     case SVGA3D_FORMAT_INVALID:
+        break;
+    default: /** @todo Other formats. Avoid MSC warning for now. */
         break;
     }
@@ -3408 +3410 @@
             mode.uintValue = pRenderState[i].uintValue;
 
-            switch (mode.s.function)
+            switch (mode.function)
             {
             case SVGA3D_FOGFUNC_INVALID:
@@ -3426 +3428 @@
                 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;
             }
 
             /* The fog type determines the render state. */
-            switch (mode.s.type)
+            switch (mode.type)
             {
             case SVGA3D_FOGTYPE_VERTEX:
@@ -3440 +3442 @@
                 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;
             }
 
             /* Set the fog base to depth or range. */
-            switch (mode.s.base)
+            switch (mode.base)
             {
             case SVGA3D_FOGBASE_DEPTHBASED:
@@ -3457 +3459 @@
             default:
                 /* ignore */
-                AssertMsgFailed(("Unexpected fog base %d\n", mode.s.base));
+                AssertMsgFailed(("Unexpected fog base %d\n", mode.base));
                 break;
             }
@@ -3469 +3471 @@
             mode.uintValue = pRenderState[i].uintValue;
 
-            switch (mode.s.mode)
+            switch (mode.mode)
             {
             case SVGA3D_FILLMODE_POINT:
@@ -3481 +3483 @@
                 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;
             }
@@ -3896 +3898 @@
             val = pRenderState[i].uintValue;
             */
-            break;
-
-        case SVGA3D_RS_LINEAA:                 /* SVGA3dBool */
-            renderState = D3DRS_ANTIALIASEDLINEENABLE;
-            val = pRenderState[i].uintValue;
             break;
 
@@ -4602 +4599 @@
         case SVGA3D_TS_BIND_TEXTURE:
             AssertFailedBreak();
+        default: /** @todo Remaining TSs. Avoid MSC warning for now. */
+            break;
         }
 
@@ -4829 +4828 @@
 
     Log(("vmsvga3dSetClipPlane %x %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);
 
     int rc = vmsvga3dContextFromCid(pState, cid, &pContext);
@@ -5761 +5760 @@
                 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

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

@@ -158 +158 @@
     case SVGA3D_BUMPL6V5U5:
     case SVGA3D_BUMPX8L8V8U8:
-    case SVGA3D_BUMPL8V8U8:
     case SVGA3D_V8U8:
     case SVGA3D_Q8W8V8U8:
@@ -193 +192 @@
     case SVGA3D_NV12:
     case SVGA3D_AYUV:
-    case SVGA3D_BC4_UNORM:
-    case SVGA3D_BC5_UNORM:
+    case SVGA3D_ATI1:
+    case SVGA3D_ATI2:
         break;
 
@@ -482 +481 @@
  * @param   paBoxes             .
  */
-int vmsvga3dSurfaceDMA(PVGASTATE pThis, PVGASTATECC pThisCC, SVGA3dGuestImage guest, SVGA3dSurfaceImageId host,
+int vmsvga3dSurfaceDMA(PVGASTATE pThis, PVGASTATECC pThisCC, SVGAGuestImage guest, SVGA3dSurfaceImageId host,
                        SVGA3dTransferType transfer, uint32_t cCopyBoxes, SVGA3dCopyBox *paBoxes)
 {
@@ -852 +851 @@
 
     SVGA3dCopyBox    box;
-    SVGA3dGuestImage dest;
+    SVGAGuestImage dest;
 
     box.srcz = 0;

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

@@ -22 +22 @@
 #endif
 
-#include "vmsvga/svga3d_reg.h"
-#include "vmsvga/svga_escape.h"
-#include "vmsvga/svga_overlay.h"
+#include "DevVGA-SVGA.h"
 
 
@@ -74 +72 @@
                               SVGA3dSurfaceImageId const *pDstSfcImg, SVGA3dBox const *pDstBox,
                               SVGA3dSurfaceImageId const *pSrcSfcImg, SVGA3dBox const *pSrcBox, SVGA3dStretchBltMode enmMode);
-int vmsvga3dSurfaceDMA(PVGASTATE pThis, PVGASTATECC pThisCC, SVGA3dGuestImage guest, SVGA3dSurfaceImageId host, SVGA3dTransferType transfer, uint32_t cCopyBoxes, SVGA3dCopyBox *pBoxes);
+int vmsvga3dSurfaceDMA(PVGASTATE pThis, PVGASTATECC pThisCC, SVGAGuestImage guest, SVGA3dSurfaceImageId host, SVGA3dTransferType transfer, uint32_t cCopyBoxes, SVGA3dCopyBox *pBoxes);
 int vmsvga3dSurfaceBlitToScreen(PVGASTATE pThis, PVGASTATECC pThisCC, uint32_t dest, SVGASignedRect destRect, SVGA3dSurfaceImageId srcImage, SVGASignedRect srcRect, uint32_t cRects, SVGASignedRect *pRect);
 

trunk/src/VBox/Devices/Makefile.kmk

@@ -287 +287 @@
  ifdef VBOX_WITH_VMSVGA
   VBoxDD_DEFS           += VBOX_WITH_VMSVGA
+  VBoxDD_INCS           += $(VBOX_PATH_VMSVGA_INC)
   VBoxDD_SOURCES        += Graphics/DevVGA-SVGA.cpp
  endif
@@ -1112 +1113 @@
  VBoxDDR0_DEFS.win      += VBOX_WITH_WIN_PARPORT_SUP
  VBoxDDR0_INCS           = build $(VBOX_GRAPHICS_INCS)
+ VBoxDDR0_INCS          += $(VBOX_PATH_VMSVGA_INC)
  VBoxDDR0_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
  VBoxDDR0_SOURCES        = \

trunk/src/VBox/Devices/testcase/Makefile.kmk

@@ -92 +92 @@
         $(VBOX_PATH_DEVICES_SRC)/Bus \
         $(VBOX_DEVICES_TEST_OUT_DIR) \
-        $(VBOX_GRAPHICS_INCS)
+        $(VBOX_GRAPHICS_INCS) \
+        $(VBOX_PATH_VMSVGA_INC)
 tstDeviceStructSize_SOURCES  = tstDeviceStructSize.cpp
 tstDeviceStructSize_CLEAN    = \