Changeset 51511 in vbox for trunk/src/VBox

Timestamp:

Jun 3, 2014 2:19:13 PM (11 years ago)

Author:

vboxsync

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

94127

Message:

DevVGA: use actual fRenderVRAM value (fixed a regression from r94031)

File:

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

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

@@ -1700 +1700 @@
  */
 static int vga_draw_text(PVGASTATE pThis, bool full_update, bool fFailOnResize, bool reset_dirty,
-        PDMIDISPLAYCONNECTOR *pDrv, bool fRenderVRAM)
+        PDMIDISPLAYCONNECTOR *pDrv)
 {
     int cx, cy, cheight, cw, ch, cattr, height, width, ch_attr;
@@ -1844 +1844 @@
                 fgcol = palette[cattr & 0x0f];
                 if (cw != 9) {
-                    if (fRenderVRAM)
+                    if (pThis->fRenderVRAM)
                         vga_draw_glyph8(d1, linesize,
                                         font_ptr, cheight, fgcol, bgcol, dscan);
@@ -1851 +1851 @@
                     if (ch >= 0xb0 && ch <= 0xdf && (pThis->ar[0x10] & 0x04))
                         dup9 = 1;
-                    if (fRenderVRAM)
+                    if (pThis->fRenderVRAM)
                         vga_draw_glyph9(d1, linesize,
                                         font_ptr, cheight, fgcol, bgcol, dup9);
@@ -1868 +1868 @@
                         d = d1 + (linesize * line_start << dscan);
                         if (cw != 9) {
-                            if (fRenderVRAM)
+                            if (pThis->fRenderVRAM)
                                 vga_draw_glyph8(d, linesize,
                                                 cursor_glyph, h, fgcol, bgcol, dscan);
                         } else {
-                            if (fRenderVRAM)
+                            if (pThis->fRenderVRAM)
                                 vga_draw_glyph9(d, linesize,
                                                 cursor_glyph, h, fgcol, bgcol, 1);
@@ -2155 +2155 @@
  */
 static int vmsvga_draw_graphic(PVGASTATE pThis, bool full_update, bool fFailOnResize, bool reset_dirty,
-                PDMIDISPLAYCONNECTOR *pDrv, bool fRenderVRAM)
+                PDMIDISPLAYCONNECTOR *pDrv)
 {
     int y, page_min, page_max, linesize, y_start;
@@ -2233 +2233 @@
             if (page1 > page_max)
                 page_max = page1;
-            if (fRenderVRAM)
+            if (pThis->fRenderVRAM)
                 vga_draw_line(pThis, d, pThis->CTX_SUFF(vram_ptr) + addr, width);
             if (pThis->cursor_draw_line)
@@ -2267 +2267 @@
  */
 static int vga_draw_graphic(PVGASTATE pThis, bool full_update, bool fFailOnResize, bool reset_dirty,
-                PDMIDISPLAYCONNECTOR *pDrv, bool fRenderVRAM)
+                PDMIDISPLAYCONNECTOR *pDrv)
 {
     int y1, y2, y, page_min, page_max, linesize, y_start, double_scan;
@@ -2345 +2345 @@
         ||  height         != (int)pThis->last_height
         ||  pThis->get_bpp(pThis)  != (int)pThis->last_bpp
-        || (offsets_changed && !fRenderVRAM))
+        || (offsets_changed && !pThis->fRenderVRAM))
     {
         if (fFailOnResize)
@@ -2358 +2358 @@
     }
 
-    if (fRenderVRAM)
+    if (pThis->fRenderVRAM)
     {
         /* Do not update the destination buffer if it is not big enough.
@@ -2420 +2420 @@
             if (page1 > page_max)
                 page_max = page1;
-            if (fRenderVRAM)
+            if (pThis->fRenderVRAM)
                 vga_draw_line(pThis, d, pThis->CTX_SUFF(vram_ptr) + addr, width);
             if (pThis->cursor_draw_line)
@@ -2461 +2461 @@
 }
 
-static void vga_draw_blank(PVGASTATE pThis, int full_update, PDMIDISPLAYCONNECTOR *pDrv, bool fRenderVRAM)
+static void vga_draw_blank(PVGASTATE pThis, int full_update, PDMIDISPLAYCONNECTOR *pDrv)
 {
     int i, w, val;
@@ -2479 +2479 @@
     w = pThis->last_scr_width * ((pDrv->cBits + 7) >> 3);
     d = pDrv->pu8Data;
-    if (fRenderVRAM)
+    if (pThis->fRenderVRAM)
     {
         for(i = 0; i < (int)pThis->last_scr_height; i++) {
@@ -2503 +2503 @@
 
 static int vga_update_display(PVGASTATE pThis, bool fUpdateAll, bool fFailOnResize, bool reset_dirty,
-        PDMIDISPLAYCONNECTOR *pDrv, int32_t *pcur_graphic_mode, bool fRenderVRAM)
+        PDMIDISPLAYCONNECTOR *pDrv, int32_t *pcur_graphic_mode)
 {
     int rc = VINF_SUCCESS;
@@ -2558 +2558 @@
             if (pThis->svga.fEnabled) {
                 *pcur_graphic_mode = GMODE_SVGA;
-                rc = vmsvga_draw_graphic(pThis, 1, false, reset_dirty, pDrv, fRenderVRAM);
+                rc = vmsvga_draw_graphic(pThis, 1, false, reset_dirty, pDrv);
             }
             else
@@ -2564 +2564 @@
             if (pThis->gr[6] & 1) {
                 *pcur_graphic_mode = GMODE_GRAPH;
-                rc = vga_draw_graphic(pThis, 1, false, reset_dirty, pDrv, fRenderVRAM);
+                rc = vga_draw_graphic(pThis, 1, false, reset_dirty, pDrv);
             } else {
                 *pcur_graphic_mode = GMODE_TEXT;
-                rc = vga_draw_text(pThis, 1, false, reset_dirty, pDrv, fRenderVRAM);
+                rc = vga_draw_text(pThis, 1, false, reset_dirty, pDrv);
             }
 
@@ -2597 +2597 @@
         switch(graphic_mode) {
         case GMODE_TEXT:
-            rc = vga_draw_text(pThis, full_update, fFailOnResize, reset_dirty, pDrv, fRenderVRAM);
+            rc = vga_draw_text(pThis, full_update, fFailOnResize, reset_dirty, pDrv);
             break;
         case GMODE_GRAPH:
-            rc = vga_draw_graphic(pThis, full_update, fFailOnResize, reset_dirty, pDrv, fRenderVRAM);
+            rc = vga_draw_graphic(pThis, full_update, fFailOnResize, reset_dirty, pDrv);
             break;
 #ifdef VBOX_WITH_VMSVGA
         case GMODE_SVGA:
-            rc = vmsvga_draw_graphic(pThis, full_update, fFailOnResize, reset_dirty, pDrv, fRenderVRAM);
+            rc = vmsvga_draw_graphic(pThis, full_update, fFailOnResize, reset_dirty, pDrv);
             break;
 #endif
         case GMODE_BLANK:
         default:
-            vga_draw_blank(pThis, full_update, pDrv, fRenderVRAM);
+            vga_draw_blank(pThis, full_update, pDrv);
             break;
         }
@@ -4611 +4611 @@
 
     rc = vga_update_display(pThis, false, false, true,
-            pThis->pDrv, &pThis->graphic_mode, pThis->fRenderVRAM);
+            pThis->pDrv, &pThis->graphic_mode);
     PDMCritSectLeave(&pThis->CritSect);
     return rc;
@@ -4644 +4644 @@
 
     return vga_update_display(pThis, true, false, true,
-            pThis->pDrv, &pThis->graphic_mode, pThis->fRenderVRAM);
+            pThis->pDrv, &pThis->graphic_mode);
 }
 
@@ -4772 +4772 @@
             int32_t cur_graphic_mode = -1;
 
+            bool fSavedRenderVRAM = pThis->fRenderVRAM;
+            pThis->fRenderVRAM = true;
+
             /*
              * Make the screenshot.
@@ -4781 +4784 @@
              */
             rc = vga_update_display(pThis, false, true, false,
-                    &Connector, &cur_graphic_mode, 1);
+                    &Connector, &cur_graphic_mode);
+
+            pThis->fRenderVRAM = fSavedRenderVRAM;
 
             if (rc == VINF_SUCCESS)