radeon: fix ColorMask

Since commit af3685d14936844f79e6f372b4b258e29375f21b various OpenGL applications regressed
on the classic mesa radeon driver.

Signed-off-by: Christopher Egert <cme3000@gmail.com>
CC: 18.1 18.2 <mesa-stable@lists.freedesktop.org>
Signed-off-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c
index d53225d..b4cff8c 100644 (file)
--- a/src/mesa/drivers/dri/r200/r200_state.c
+++ b/src/mesa/drivers/dri/r200/r200_state.c
@@ -688,10 +688,10 @@ static void r200ColorMask( struct gl_context *ctx,
    if (!rrb)
      return;
    mask = radeonPackColor( rrb->cpp,
-                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 0),
-                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 1),
-                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 2),
-                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 3) );
+                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 0)*0xFF,
+                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 1)*0xFF,
+                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 2)*0xFF,
+                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 3)*0xFF );
 
 
    if (!(r && g && b && a))

diff --git a/src/mesa/drivers/dri/radeon/radeon_state.c b/src/mesa/drivers/dri/radeon/radeon_state.c
index 8b72c98..410a78f 100644 (file)
--- a/src/mesa/drivers/dri/radeon/radeon_state.c
+++ b/src/mesa/drivers/dri/radeon/radeon_state.c
@@ -503,10 +503,10 @@ static void radeonColorMask( struct gl_context *ctx,
      return;
 
    mask = radeonPackColor( rrb->cpp,
-                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 0),
-                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 1),
-                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 2),
-                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 3) );
+                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 0)*0xFF,
+                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 1)*0xFF,
+                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 2)*0xFF,
+                          GET_COLORMASK_BIT(ctx->Color.ColorMask, 0, 3)*0xFF );
 
    if ( rmesa->hw.msk.cmd[MSK_RB3D_PLANEMASK] != mask ) {
       RADEON_STATECHANGE( rmesa, msk );