From 88440d2d7524c64c4db52a93d1952d4ab859e5ce Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 12 Jan 2005 21:55:47 +0000
Subject: Don't special-case 16bpp for colormask register - not needed.

---
 src/mesa/drivers/dri/unichrome/via_state.c | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c
index 06ba531265..a827849035 100644
--- a/src/mesa/drivers/dri/unichrome/via_state.c
+++ b/src/mesa/drivers/dri/unichrome/via_state.c
@@ -1320,18 +1320,10 @@ static void viaChooseColorState(GLcontext *ctx)
     else
         vmesa->regHROP = HC_HROP_P;
 
-    if (vmesa->viaScreen->bitsPerPixel == 32) {
-    	vmesa->regHFBBMSKL = PACK_COLOR_888(ctx->Color.ColorMask[0],
-			 		    ctx->Color.ColorMask[1],
-			 		    ctx->Color.ColorMask[2]);
-    	vmesa->regHROP |= ctx->Color.ColorMask[3];
-    } else {
-    	GLushort color = PACK_COLOR_565(ctx->Color.ColorMask[0],
-			 		ctx->Color.ColorMask[1],
-			 		ctx->Color.ColorMask[2]);
-    	vmesa->regHFBBMSKL = (color & 0xFF) << 16;
-    	vmesa->regHROP |= (color & 0xFF00) >> 8;
-    }
+    vmesa->regHFBBMSKL = PACK_COLOR_888(ctx->Color.ColorMask[0],
+					ctx->Color.ColorMask[1],
+					ctx->Color.ColorMask[2]);
+    vmesa->regHROP |= ctx->Color.ColorMask[3];
 
     if (ctx->Color.ColorMask[3])
         vmesa->regEnable |= HC_HenAW_MASK;
-- 
cgit v1.2.3