Changeset 87105 in vbox for trunk/src

Timestamp:

Dec 18, 2020 6:27:04 PM (4 years ago)

Author:

vboxsync

Message:

DevVGA: Finish the elimination of vram_ptr. bugref:9218

Location:

trunk/src/VBox/Devices/Graphics

Files:

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

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

@@ -2069 +2069 @@
 
 #  if 0 /* unused? */
-int vgaR3UpdateDisplay(VGAState *s, unsigned xStart, unsigned yStart, unsigned cx, unsigned cy)
+int vgaR3UpdateDisplay(PVGASTATE pThis, PVGASTATER3 pThisCC, unsigned xStart, unsigned yStart, unsigned cx, unsigned cy, PDMIDISPLAYCONNECTOR *pDrv)
 {
     uint32_t v;
     vga_draw_line_func *vga_draw_line;
 
-    if (!s->fRenderVRAM)
-    {
-        s->pDrv->pfnUpdateRect(s->pDrv, xStart, yStart, cx, cy);
+    if (!pThis->fRenderVRAM)
+    {
+        pDrv->pfnUpdateRect(pDrv, xStart, yStart, cx, cy);
         return VINF_SUCCESS;
     }
     /** @todo might crash if a blit follows a resolution change very quickly (seen this many times!) */
 
-    if (    s->svga.uWidth  == VMSVGA_VAL_UNINITIALIZED
-        ||  s->svga.uHeight == VMSVGA_VAL_UNINITIALIZED
-        ||  s->svga.uBpp    == VMSVGA_VAL_UNINITIALIZED)
+    if (    pThis->svga.uWidth  == VMSVGA_VAL_UNINITIALIZED
+        ||  pThis->svga.uHeight == VMSVGA_VAL_UNINITIALIZED
+        ||  pThis->svga.uBpp    == VMSVGA_VAL_UNINITIALIZED)
     {
         /* Intermediate state; skip redraws. */
@@ -2091 +2091 @@
 
     uint32_t cBits;
-    switch (s->svga.uBpp) {
+    switch (pThis->svga.uBpp) {
     default:
     case 0:
@@ -2114 +2114 @@
         break;
     }
-    vga_draw_line = vga_draw_line_table[v * 4 + vgaR3GetDepthIndex(s->pDrv->cBits)];
-
-    uint32_t offSrc = (xStart * cBits) / 8 + s->svga.cbScanline * yStart;
-    uint32_t offDst = (xStart * RT_ALIGN(s->pDrv->cBits, 8)) / 8 + s->pDrv->cbScanline * yStart;
-
-    uint8_t       *pbDst = s->pDrv->pbData       + offDst;
-    uint8_t const *pbSrc = s->CTX_SUFF(vram_ptr) + offSrc;
+    vga_draw_line = vga_draw_line_table[v * 4 + vgaR3GetDepthIndex(pDrv->cBits)];
+
+    uint32_t offSrc = (xStart * cBits) / 8 + pThis->svga.cbScanline * yStart;
+    uint32_t offDst = (xStart * RT_ALIGN(pDrv->cBits, 8)) / 8 + pDrv->cbScanline * yStart;
+
+    uint8_t       *pbDst = pDrv->pbData     + offDst;
+    uint8_t const *pbSrc = pThisCC->pbVRam  + offSrc;
 
     for (unsigned y = yStart; y < yStart + cy; y++)
     {
-        vga_draw_line(s, pbDst, pbSrc, cx);
-
-        pbDst += s->pDrv->cbScanline;
-        pbSrc += s->svga.cbScanline;
-    }
-    s->pDrv->pfnUpdateRect(s->pDrv, xStart, yStart, cx, cy);
+        vga_draw_line(pThis, pThisCC, pbDst, pbSrc, cx);
+
+        pbDst += pDrv->cbScanline;
+        pbSrc += pThis->svga.cbScanline;
+    }
+    pDrv->pfnUpdateRect(pDrv, xStart, yStart, cx, cy);
 
     return VINF_SUCCESS;
@@ -6602 +6602 @@
     AssertLogRelRCReturn(rc, PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS,
                                                  N_("Failed to allocate %u bytes of VRAM"), pThis->vram_size));
-# ifndef VGA_WITH_PARTIAL_RING0_MAPPING
-    pThis->vram_ptrR0 = (RTR0PTR)pThisCC->pbVRam;
-# endif
 
     /*

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

@@ -193 +193 @@
 #ifndef VBOX
 #define VGA_STATE_COMMON                                                \
-    uint8_t *vram_ptr;                                                  \
     unsigned long vram_offset;                                          \
     unsigned int vram_size;                                             \