Changeset 74135 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA.cpp

Timestamp:

Sep 7, 2018 8:15:19 AM (6 years ago)

Author:

vboxsync

Message:

DevVGA: Removed unused argument.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (4 diffs)

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

@@ -974 +974 @@
 #endif
 
-static void recalculate_data(PVGASTATE pThis, bool fVirtHeightOnly)
+static void recalculate_data(PVGASTATE pThis)
 {
     uint16_t cBPP        = pThis->vbe_regs[VBE_DISPI_INDEX_BPP];
@@ -986 +986 @@
     Assert(cbLinePitch != 0);
     uint32_t cVirtHeight = pThis->vram_size / cbLinePitch;
-    if (!fVirtHeightOnly)
-    {
-        uint16_t offX        = pThis->vbe_regs[VBE_DISPI_INDEX_X_OFFSET];
-        uint16_t offY        = pThis->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET];
-        uint32_t offStart    = cbLinePitch * offY;
-        if (cBPP == 4)
-            offStart += offX >> 1;
-        else
-            offStart += offX * ((cBPP + 7) >> 3);
-        offStart >>= 2;
-        pThis->vbe_line_offset = RT_MIN(cbLinePitch, pThis->vram_size);
-        pThis->vbe_start_addr  = RT_MIN(offStart, pThis->vram_size);
-    }
+    uint16_t offX        = pThis->vbe_regs[VBE_DISPI_INDEX_X_OFFSET];
+    uint16_t offY        = pThis->vbe_regs[VBE_DISPI_INDEX_Y_OFFSET];
+    uint32_t offStart    = cbLinePitch * offY;
+    if (cBPP == 4)
+        offStart += offX >> 1;
+    else
+        offStart += offX * ((cBPP + 7) >> 3);
+    offStart >>= 2;
+    pThis->vbe_line_offset = RT_MIN(cbLinePitch, pThis->vram_size);
+    pThis->vbe_start_addr  = RT_MIN(offStart, pThis->vram_size);
 
     /* The VBE_DISPI_INDEX_VIRT_HEIGHT is used to prevent setting resolution bigger than
@@ -1230 +1227 @@
         if (fRecalculate)
         {
-            recalculate_data(pThis, false);
+            recalculate_data(pThis);
         }
     }
@@ -2817 +2814 @@
         SSMR3GetU16(pSSM, &pThis->vbe_regs[i]);
     if (version_id <= VGA_SAVEDSTATE_VERSION_INV_VHEIGHT)
-        recalculate_data(pThis, false); /* <- re-calculate the pThis->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] since it might be invalid */
+        recalculate_data(pThis);    /* <- re-calculate the pThis->vbe_regs[VBE_DISPI_INDEX_VIRT_HEIGHT] since it might be invalid */
     SSMR3GetU32(pSSM, &pThis->vbe_start_addr);
     SSMR3GetU32(pSSM, &pThis->vbe_line_offset);