Clean up color/planemask replicating.

1 files changed, 5 insertions, 8 deletions

diff --git a/src/mga_exa.c b/src/mga_exa.c
index 9b0f01e..5a5c0d6 100644
--- a/src/mga_exa.c
+++ b/src/mga_exa.c
@@ -182,21 +182,18 @@ mgaPrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg)
     PMGA(pPixmap);
     QUIESCE_DMA(pPixmap);
 
-    /* FIXME: taken from kdrive. Is this needed? Doesn't seem to affect
-     * rendering...
-     *
-     * We must pad planemask and fg depending on the format of the
+    /* We must pad planemask and fg depending on the format of the
      * destination pixmap
      */
     switch (pPixmap->drawable.bitsPerPixel) {
+    case 8:
+        fg |= fg << 8;
+        planemask |= planemask << 8;
+        /* fall through */
     case 16:
         fg |= fg << 16;
         planemask |= planemask << 16;
         break;
-    case 8:
-        fg |= (fg << 8) | (fg << 16) | (fg << 24);
-        planemask |= (planemask << 8) | (planemask << 16) | (planemask << 24);
-        break;
     }
 
     pMga->FilledRectCMD = MGADWG_TRAP | MGADWG_SOLID | MGADWG_ARZERO |