Changeset 65305 in vbox for trunk/src/VBox/Devices/Graphics

Timestamp:

Jan 16, 2017 8:12:05 AM (8 years ago)

Author:

vboxsync

Message:

VMSVGA/Cursor: 1-bit XOR conversion fix. Multi-bit AND mask conversion hacks.

File:

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

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

@@ -2446 +2446 @@
             }
             break;
+        /* Should take the XOR mask into account for the multi-bit AND mask. */
         case 8:
             for (uint32_t y = 0; y < cy; y++)
@@ -2455 +2456 @@
                     do
                     {
-                        if (pbSrc[x])
+                        uintptr_t const idxPal = pbSrc[x] * 3;
+                        if ((  pThis->last_palette[idxPal + 2]
+                             | pThis->last_palette[idxPal + 1]
+                             | pThis->last_palette[idxPal + 0]) > 0xfc)
                             bDst |= fBit;
                         fBit <<= 1;
@@ -2475 +2479 @@
                     do
                     {
-                        if (pbSrc[x * 2] || (pbSrc[x * 2 + 1] & 0x7f))
+                        if ((pbSrc[x * 2] | (pbSrc[x * 2 + 1] & 0x7f)) >= 0xfc)
                             bDst |= fBit;
                         fBit <<= 1;
@@ -2495 +2499 @@
                     do
                     {
-                        if (pbSrc[x * 2] || pbSrc[x * 2 + 1])
+                        if ((pbSrc[x * 2] | pbSrc[x * 2 + 1]) >= 0xfc)
                             bDst |= fBit;
                         fBit <<= 1;
@@ -2515 +2519 @@
                     do
                     {
-                        if (pbSrc[x * 3] || pbSrc[x * 3 + 1] || pbSrc[x * 3 + 2])
+                        if ((pbSrc[x * 3] | pbSrc[x * 3 + 1] | pbSrc[x * 3 + 2]) >= 0xfc)
                             bDst |= fBit;
                         fBit <<= 1;
@@ -2534 +2538 @@
                     do
                     {
-                        if (pbSrc[x * 4] || pbSrc[x * 4 + 1] || pbSrc[x * 4 + 2] || pbSrc[x * 4 + 3])
+                        if ((pbSrc[x * 4] | pbSrc[x * 4 + 1] | pbSrc[x * 4 + 2] | pbSrc[x * 4 + 3]) >= 0xfc)
                             bDst |= fBit;
                         fBit <<= 1;
@@ -2558 +2562 @@
             for (uint32_t y = 0; y < cy; y++)
             {
-                for (uint32_t x = 0; x < cx; x++)
-                    *pu32Dst++ = ASMBitTest(pbSrc, x) ? UINT32_C(0x00ffffff) : 0;
+                for (uint32_t x = 0; x < cx; )
+                {
+                    /* most significant bit is the left most one. */
+                    uint8_t bSrc = pbSrc[x / 8];
+                    do
+                    {
+                        *pu32Dst++ = bSrc & 0x80 ? UINT32_C(0x00ffffff) : 0;
+                        bSrc <<= 1;
+                        x++;
+                    } while ((x & 7) && x < cx);
+                }
                 pbSrc += cbSrcXorLine;
             }