Changeset 32811 in vbox

Timestamp:

Sep 29, 2010 11:00:03 AM (15 years ago)

Author:

vboxsync

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

66263

Message:

VGA: Proper visible width calculation.

File:

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

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

@@ -2191 +2191 @@
 {
     int y1, y2, y, update, page_min, page_max, linesize, y_start, double_scan;
-    int width, height, shift_control, line_offset, page0, page1, bwidth;
+    int width, height, shift_control, line_offset, page0, page1, bwidth, bits;
     int disp_width, multi_run;
     uint8_t *d;
@@ -2223 +2223 @@
             v = VGA_DRAW_LINE4;
         }
+        bits = 4;
     } else if (shift_control == 1) {
         full_update |= update_palette16(s);
@@ -2231 +2232 @@
             v = VGA_DRAW_LINE2;
         }
+        bits = 4;
     } else {
         switch(s->get_bpp(s)) {
@@ -2237 +2239 @@
             full_update |= update_palette256(s);
             v = VGA_DRAW_LINE8D2;
+            bits = 4;
             break;
         case 8:
             full_update |= update_palette256(s);
             v = VGA_DRAW_LINE8;
+            bits = 8;
             break;
         case 15:
             v = VGA_DRAW_LINE15;
+            bits = 16;
             break;
         case 16:
             v = VGA_DRAW_LINE16;
+            bits = 16;
             break;
         case 24:
             v = VGA_DRAW_LINE24;
+            bits = 24;
             break;
         case 32:
             v = VGA_DRAW_LINE32;
+            bits = 32;
             break;
         }
@@ -2299 +2307 @@
     bwidth = width * 4;
 #else /* VBOX */
-    /* The width of VRAM scanline. */
-    bwidth = s->line_offset;
-    /* In some cases the variable is not yet set, probably due to incomplete
-     * programming of the virtual hardware ports. Just return.
-     */
-    if (bwidth == 0) return VINF_SUCCESS;
+    bwidth = (width * bits + 7) / 8;    /* The visible width of a scanline. */
 #endif /* VBOX */
     y_start = -1;