diff options
| author | Keith Whitwell <[email protected]> | 2005-01-12 21:55:47 +0000 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2005-01-12 21:55:47 +0000 |
| commit | 88440d2d7524c64c4db52a93d1952d4ab859e5ce (patch) | |
| tree | 35454d3783392bc33a960e90bf6f3c42ce4ddbe5 | |
| parent | 8e5281fbe1a7b9beea77b93a9cdd1e842a3edfa0 (diff) | |
Don't special-case 16bpp for colormask register - not needed.
| -rw-r--r-- | src/mesa/drivers/dri/unichrome/via_state.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/mesa/drivers/dri/unichrome/via_state.c b/src/mesa/drivers/dri/unichrome/via_state.c index 06ba531265b..a8278490352 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; |