fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeon: fix ColorMask

Browse source 
Since commit af3685d149 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>
(cherry picked from commit 51995f6920)
This commit is contained in:
Christopher Egert 2018-09-08 02:16:48 +02:00 • committed by Dylan Baker
parent 09196d4b66
commit 3a23ba5acb
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mesa/drivers/dri/r200/r200_state.c
View file

@ -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))

8
src/mesa/drivers/dri/radeon/radeon_state.c
View file

@ -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 );