Changeset 7814 in vbox for trunk/src/VBox

Timestamp:

Apr 8, 2008 7:25:27 PM (17 years ago)

Author:

vboxsync

Message:

Use dirty bits instead of pfnUpdateRect.

Location:

trunk/src/VBox/Devices

Files:

• Graphics/DevVGA.cpp (modified) (5 diffs)
• PC/BIOS/logo.c (modified) (4 diffs)

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

@@ -3631 +3631 @@
                 break;
 
+            case LOGO_CMD_BUF_BLT:
+            {
+                if (pData->vram_size >= LOGO_MAX_SIZE * 2)
+                {
+                    uint32_t *pu32TmpDst = (uint32_t *)pData->vram_ptrHC;
+                    uint32_t *pu32TmpSrc = (uint32_t *)pData->vram_ptrHC + LOGO_MAX_SIZE / 4;
+                    for (i = 0; i < LOGO_MAX_WIDTH; i++)
+                    {
+                        for (j = 0; j < LOGO_MAX_HEIGHT; j++)
+                            *pu32TmpDst++ = *pu32TmpSrc++;
+                    }
+                }
+                break;
+            }
+
             case LOGO_CMD_SET_PAL:
             {
@@ -3657 +3672 @@
             }
 
+            case LOGO_CMD_SET_DIRTY:
+            {
+                /* Set dirty flags */
+                uint32_t off = 0;
+                uint32_t size = LOGO_MAX_SIZE;
+                while (off <= size)
+                {
+                    vga_set_dirty(pData, off);
+                    off += PAGE_SIZE;
+                }
+                break;
+            }
+
             case LOGO_CMD_CLS:
             {
+                uint32_t *pu32TmpPtr;
+
+                if (pData->vram_size >= LOGO_MAX_SIZE * 2)
+                    pu32TmpPtr = (uint32_t *)pData->vram_ptrHC + LOGO_MAX_SIZE / 4;
+                else
+                    pu32TmpPtr = (uint32_t *)pData->vram_ptrHC;
+
                 /* Clear vram */
-                uint32_t *pu32TmpPtr = (uint32_t *)pData->vram_ptrHC;
                 for (i = 0; i < LOGO_MAX_WIDTH; i++)
                 {
@@ -3675 +3709 @@
 
                 /*
-                 * Determin bytes per pixel in the destination buffer.
+                 * Determine bytes per pixel in the destination buffer.
                  */
                 if ((u32 & 0xFF00) == LOGO_CMD_SHOW_TEXT)
@@ -3693 +3727 @@
                 size_t          cbPadBytes  = 0;
                 size_t          cbLineDst   = pData->pDrv->cbScanline;
-                uint8_t        *pu8Dst      = pData->vram_ptrHC;
+                uint8_t        *pu8Dst;
                 uint32_t        cyLeft      = cy;
                 uint16_t        i;
+
+                if (pData->vram_size >= LOGO_MAX_SIZE * 2)
+                    pu8Dst = (uint8_t *)pData->vram_ptrHC + LOGO_MAX_SIZE;
+                else
+                    pu8Dst = (uint8_t *)pData->vram_ptrHC;
 
                 pu8Dst += pData->xLogo * 4 + pData->yLogo * cbLineDst;
@@ -3816 +3855 @@
                     pu8Src += cbPadBytes;
                 }
-
-                /*
-                 * Invalidate the area.
-                 */
-/** @todo cannot call this here. Just set the appropriate dirty bits. */
-                pData->pDrv->pfnUpdateRect(pData->pDrv, 0, 0, LOGO_MAX_WIDTH, LOGO_MAX_WIDTH);
-
                 pData->LogoCommand = LOGO_CMD_NOP;
                 break;

trunk/src/VBox/Devices/PC/BIOS/logo.c

@@ -660 +660 @@
         outw(LOGO_IO_PORT, LOGO_CMD_CLS);
 
+        // Set dirty bits
+        outw(LOGO_IO_PORT, LOGO_CMD_SET_DIRTY);
+
         if (is_fade_in)
         {
@@ -675 +678 @@
                     show_boot_text(i);
 
+                // Blit buffer
+                outw(LOGO_IO_PORT, LOGO_CMD_BUF_BLT);
+
+                // Set dirty bits
+                outw(LOGO_IO_PORT, LOGO_CMD_SET_DIRTY);
+
                 wait(16 / WAIT_MS, 0);
             }
@@ -690 +699 @@
             if (uBootMenu == 2)
                 show_boot_text(LOGO_SHOW_STEPS);
+
+            // Blit buffer
+            outw(LOGO_IO_PORT, LOGO_CMD_BUF_BLT);
+
+            // Set dirty bits
+            outw(LOGO_IO_PORT, LOGO_CMD_SET_DIRTY);
         }
 
@@ -714 +729 @@
                 if (uBootMenu == 2)
                     show_boot_text(i);
+
+                // Blit buffer
+                outw(LOGO_IO_PORT, LOGO_CMD_BUF_BLT);
+
+                // Set dirty bits
+                outw(LOGO_IO_PORT, LOGO_CMD_SET_DIRTY);
 
                 scode = wait(16 / WAIT_MS, 0);