Changeset 73328 in vbox for trunk/src/VBox

Timestamp:

Jul 23, 2018 2:55:54 PM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA: SVGA_CMD_BLIT_GMRFB_TO_SCREEN and SVGA_CMD_BLIT_SCREEN_TO_GMRFB updates

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA.cpp (modified) (2 diffs)

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

@@ -3796 +3796 @@
                  */
                 uint8_t * const pbHstBuf = (uint8_t *)pThis->CTX_SUFF(vram_ptr) + pThis->svga.uScreenOffset;
-                uint32_t cbHstBuf = pThis->svga.cbScanline * pThis->svga.uHeight;
+                uint32_t const cbScanline = pThis->svga.cbScanline ? pThis->svga.cbScanline :
+                                                                     width * (RT_ALIGN(pThis->svga.uBpp, 8) / 8);
+                uint32_t cbHstBuf = cbScanline * pThis->svga.uHeight;
                 if (cbHstBuf > pThis->vram_size - pThis->svga.uScreenOffset)
                    cbHstBuf = pThis->vram_size - pThis->svga.uScreenOffset; /* Paranoia. */
                 uint32_t const offHst =   (clipRect.left * RT_ALIGN(pThis->svga.uBpp, 8)) / 8
-                                        + pThis->svga.cbScanline * clipRect.top;
-                int32_t const cbHstPitch = pThis->svga.cbScanline;
+                                        + cbScanline * clipRect.top;
+                int32_t const cbHstPitch = cbScanline;
 
                 /* Source: GMRFB. vmsvgaGMRTransfer ensures that no memory outside the GMR is read. */
@@ -3862 +3864 @@
                  */
                 uint8_t * const pbHstBuf = (uint8_t *)pThis->CTX_SUFF(vram_ptr) + pThis->svga.uScreenOffset;
-                uint32_t cbHstBuf = pThis->svga.cbScanline * pThis->svga.uHeight;
+                uint32_t const cbScanline = pThis->svga.cbScanline ? pThis->svga.cbScanline :
+                                                                     width * (RT_ALIGN(pThis->svga.uBpp, 8) / 8);
+                uint32_t cbHstBuf = cbScanline * pThis->svga.uHeight;
                 if (cbHstBuf > pThis->vram_size - pThis->svga.uScreenOffset)
                    cbHstBuf = pThis->vram_size - pThis->svga.uScreenOffset; /* Paranoia. */
                 uint32_t const offHst =   (clipRect.left * RT_ALIGN(pThis->svga.uBpp, 8)) / 8
-                                        + pThis->svga.cbScanline * clipRect.top;
-                int32_t const cbHstPitch = pThis->svga.cbScanline;
+                                        + cbScanline * clipRect.top;
+                int32_t const cbHstPitch = cbScanline;
 
                 /* Destination: GMRFB. vmsvgaGMRTransfer ensures that no memory outside the GMR is read. */