Changeset 69904 in vbox

Timestamp:

Dec 1, 2017 8:29:24 PM (7 years ago)

Author:

vboxsync

Message:

Devices/Graphics: VMSVGA: take screen offset into account; saved state for occlusion query; increase saved state version.

Location:

trunk/src/VBox/Devices/Graphics

Files:

• DevVGA-SVGA.cpp (modified) (8 diffs)
• DevVGA-SVGA.h (modified) (1 diff)
• DevVGA-SVGA3d-ogl.cpp (modified) (3 diffs)
• DevVGA-SVGA3d-savedstate.cpp (modified) (5 diffs)
• DevVGA-SVGA3d-win.cpp (modified) (2 diffs)
• DevVGASavedState.h (modified) (1 diff)

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

@@ -487 +487 @@
     SSMFIELD_ENTRY(                 VMSVGAState, uBpp),
     SSMFIELD_ENTRY(                 VMSVGAState, cbScanline),
+    SSMFIELD_ENTRY_VER(             VMSVGAState, uScreenOffset, VGA_SAVEDSTATE_VERSION_VMSVGA),
+    SSMFIELD_ENTRY_IGNORE(          VMSVGAState, uLastScreenOffset), /* VGA_SAVEDSTATE_VERSION_VMSVGA */
     SSMFIELD_ENTRY(                 VMSVGAState, u32MaxWidth),
     SSMFIELD_ENTRY(                 VMSVGAState, u32MaxHeight),
@@ -1233 +1235 @@
         &&  pThis->last_width       == (unsigned)pThis->svga.uWidth
         &&  pThis->last_height      == (unsigned)pThis->svga.uHeight
+        &&  pThis->svga.uLastScreenOffset == pThis->svga.uScreenOffset
         )
     {
@@ -1240 +1243 @@
     }
 
-    Log(("vmsvgaChangeMode: sEnable LFB mode and resize to (%d,%d) bpp=%d\n", pThis->svga.uWidth, pThis->svga.uHeight, pThis->svga.uBpp));
+    LogFunc(("Enable LFB mode and resize to (%d,%d) bpp=%d uScreenOffset 0x%x\n", pThis->svga.uWidth, pThis->svga.uHeight, pThis->svga.uBpp, pThis->svga.uScreenOffset));
     pThis->svga.cbScanline = ((pThis->svga.uWidth * pThis->svga.uBpp + 7) & ~7) / 8;
 
     pThis->pDrv->pfnLFBModeChange(pThis->pDrv, true);
-    rc = pThis->pDrv->pfnResize(pThis->pDrv, pThis->svga.uBpp, pThis->CTX_SUFF(vram_ptr), pThis->svga.cbScanline, pThis->svga.uWidth, pThis->svga.uHeight);
+
+    VBVAINFOVIEW view;
+    view.u32ViewIndex     = 0;
+    view.u32ViewOffset    = 0;
+    view.u32ViewSize      = pThis->vram_size;
+    view.u32MaxScreenSize = pThis->vram_size;
+
+    VBVAINFOSCREEN screen;
+    screen.u32ViewIndex    = 0;
+    screen.i32OriginX      = 0;
+    screen.i32OriginY      = 0;
+    screen.u32StartOffset  = pThis->svga.uScreenOffset;
+    screen.u32LineSize     = pThis->svga.cbScanline;
+    screen.u32Width        = pThis->svga.uWidth;
+    screen.u32Height       = pThis->svga.uHeight;
+    screen.u16BitsPerPixel = pThis->svga.uBpp;
+    screen.u16Flags        = VBVA_SCREEN_F_ACTIVE;
+
+    rc = pThis->pDrv->pfnVBVAResize(pThis->pDrv, &view, &screen, pThis->CTX_SUFF(vram_ptr), /*fResetInputMapping=*/ true);
     AssertRC(rc);
     AssertReturn(rc == VINF_SUCCESS || rc == VINF_VGA_RESIZE_IN_PROGRESS, rc);
@@ -1254 +1275 @@
     pThis->last_width       = pThis->svga.uWidth;
     pThis->last_height      = pThis->svga.uHeight;
+    pThis->svga.uLastScreenOffset = pThis->svga.uScreenOffset;
 
     ASMAtomicOrU32(&pThis->svga.u32ActionFlags, VMSVGA_ACTION_CHANGEMODE);
@@ -3609 +3631 @@
                 SVGAFifoCmdDefineScreen *pCmd;
                 VMSVGAFIFO_GET_CMD_BUFFER_BREAK(pCmd, SVGAFifoCmdDefineScreen, sizeof(pCmd->screen.structSize));
-                RT_BZERO(&pCmd->screen.id, sizeof(*pCmd) - RT_OFFSETOF(SVGAFifoCmdDefineScreen, screen.structSize));
+                RT_BZERO(&pCmd->screen.id, sizeof(*pCmd) - RT_OFFSETOF(SVGAFifoCmdDefineScreen, screen.id));
                 VMSVGAFIFO_GET_MORE_CMD_BUFFER_BREAK(pCmd, SVGAFifoCmdDefineScreen, RT_MAX(sizeof(pCmd->screen.structSize), pCmd->screen.structSize));
                 STAM_REL_COUNTER_INC(&pSVGAState->StatR3CmdDefineScreen);
@@ -3625 +3647 @@
                     Log(("vmsvgaFIFOLoop: SVGA_CMD_DEFINE_SCREEN flags SVGA_SCREEN_BLANKING\n"));
 
+                const uint32_t uWidth = pCmd->screen.size.width;
+                AssertBreak(0 < uWidth && uWidth <= pThis->svga.u32MaxWidth);
+
+                const uint32_t uHeight = pCmd->screen.size.height;
+                AssertBreak(0 < uHeight && uHeight <= pThis->svga.u32MaxHeight);
+
+                const uint32_t cbWidth = uWidth * ((pThis->svga.uBpp + 7) / 8);
+                const uint32_t cbPitch = pCmd->screen.backingStore.pitch ? pCmd->screen.backingStore.pitch : cbWidth;
+                AssertBreak(0 < cbWidth && cbWidth <= cbPitch);
+
+                const uint32_t uScreenOffset = pCmd->screen.backingStore.ptr.offset;
+                AssertBreak(uScreenOffset < pThis->vram_size);
+
+                const uint32_t cbVram = pThis->vram_size - uScreenOffset;
+                AssertBreak(uHeight <= cbVram / cbPitch);
+
                 /** @todo multi monitor support and screen object capabilities.   */
-                pThis->svga.uWidth  = pCmd->screen.size.width;
-                pThis->svga.uHeight = pCmd->screen.size.height;
+                pThis->svga.uWidth        = uWidth;
+                pThis->svga.uHeight       = uHeight;
+                pThis->svga.uScreenOffset = uScreenOffset;
                 vmsvgaChangeMode(pThis);
                 break;
@@ -3694 +3733 @@
                 AssertBreak(pSVGAState->GMRFB.format.s.bitsPerPixel != 0);
 
-                const uint32_t cScanlines = pThis->vram_size / pSVGAState->GMRFB.bytesPerLine;
+                AssertBreak(pThis->svga.uScreenOffset < pThis->vram_size); /* Paranoia. Ensured by SVGA_CMD_DEFINE_SCREEN. */
+                const uint32_t cbVram = pThis->vram_size - pThis->svga.uScreenOffset;
+
+                const uint32_t cScanlines = cbVram / pSVGAState->GMRFB.bytesPerLine;
                 AssertBreak(pCmd->srcOrigin.y < (int32_t)cScanlines);
 
@@ -3703 +3745 @@
                 unsigned cbCopyWidth  = (width * RT_ALIGN(pThis->svga.uBpp, 8)) / 8;
 
-                AssertBreak(offsetDest < pThis->vram_size);
+                AssertBreak(offsetDest < cbVram);
+                offsetDest += pThis->svga.uScreenOffset;
 
                 rc = vmsvgaGMRTransfer(pThis, SVGA3D_WRITE_HOST_VRAM, pThis->CTX_SUFF(vram_ptr) + offsetDest, pThis->svga.cbScanline, pSVGAState->GMRFB.ptr, offsetSource, pSVGAState->GMRFB.bytesPerLine, cbCopyWidth, height);

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

@@ -210 +210 @@
     uint32_t                    uBpp;
     uint32_t                    cbScanline;
+    uint32_t                    uScreenOffset;
+    uint32_t                    uLastScreenOffset;
     /** Maximum width supported. */
     uint32_t                    u32MaxWidth;

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

@@ -1363 +1363 @@
     case SVGA3D_DEVCAP_MAX_VOLUME_EXTENT:
         //*pu32Val = pCaps->MaxVolumeExtent;
+        *pu32Val = 256;
         break;
 
@@ -2597 +2598 @@
 
         dst.ptr.gmrId  = SVGA_GMR_FRAMEBUFFER;
-        dst.ptr.offset = 0;
+        dst.ptr.offset = pThis->svga.uScreenOffset;
         dst.pitch      = pThis->svga.cbScanline;
 
@@ -2616 +2617 @@
 
         dst.ptr.gmrId  = SVGA_GMR_FRAMEBUFFER;
-        dst.ptr.offset = 0;
+        dst.ptr.offset = pThis->svga.uScreenOffset;
         dst.pitch      = pThis->svga.cbScanline;
 

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

@@ -345 +345 @@
             }
 
-#if 0 /** @todo */
-            if (uVersion >= VGA_SAVEDSTATE_VERSION_VMSVGA_TEX_STAGES) /** @todo VGA_SAVEDSTATE_VERSION_VMSVGA_3D */
+            if (uVersion >= VGA_SAVEDSTATE_VERSION_VMSVGA)
             {
                 VMSVGA3DQUERY query;
@@ -384 +383 @@
                 }
             }
-#endif
         }
     }
@@ -504 +502 @@
 static int vmsvga3dSaveContext(PVGASTATE pThis, PSSMHANDLE pSSM, PVMSVGA3DCONTEXT pContext)
 {
-    RT_NOREF(pThis);
+    PVMSVGA3DSTATE pState = pThis->svga.p3dState;
     uint32_t cid = pContext->id;
 
@@ -601 +599 @@
         }
 
-#if 0 /** @todo Enable later. */
-        PVMSVGA3DSTATE pState = pThis->svga.p3dState;
         /* Occlusion query. */
         if (!VMSVGA3DQUERY_EXISTS(&pContext->occlusion))
@@ -635 +631 @@
         rc = SSMR3PutStructEx(pSSM, &pContext->occlusion, sizeof(pContext->occlusion), 0, g_aVMSVGA3DQUERYFields, NULL);
         AssertRCReturn(rc, rc);
-#endif
     }
 

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

@@ -2397 +2397 @@
 
         dest.ptr.gmrId  = SVGA_GMR_FRAMEBUFFER;
-        dest.ptr.offset = 0;
+        dest.ptr.offset = pThis->svga.uScreenOffset;
         dest.pitch      = pThis->svga.cbScanline;
 
@@ -2416 +2416 @@
 
         dest.ptr.gmrId  = SVGA_GMR_FRAMEBUFFER;
-        dest.ptr.offset = 0;
+        dest.ptr.offset = pThis->svga.uScreenOffset;
         dest.pitch      = pThis->svga.cbScanline;
 

trunk/src/VBox/Devices/Graphics/DevVGASavedState.h

@@ -45 +45 @@
     } while (0)
 
-#define VGA_SAVEDSTATE_VERSION              19
+#define VGA_SAVEDSTATE_VERSION              20
+#define VGA_SAVEDSTATE_VERSION_VMSVGA       20 /* Multiple updates and fixes for VMSVGA saved state. */
 #define VGA_SAVEDSTATE_VERSION_VMSVGA_TEX_STAGES 19
 #define VGA_SAVEDSTATE_VERSION_VMSVGA_GMR_COUNT  18