From: Aapo Tahkola Date: Sat, 14 May 2005 16:52:32 +0000 (+0000) Subject: Dont assume GLbooleans are ones when true. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d5084d42d4b91b5f5c368673d95f729b5cbb590f;p=mesa.git Dont assume GLbooleans are ones when true. --- diff --git a/src/mesa/drivers/dri/r300/r300_state.c b/src/mesa/drivers/dri/r300/r300_state.c index 7d1835f2e72..16077560965 100644 --- a/src/mesa/drivers/dri/r300/r300_state.c +++ b/src/mesa/drivers/dri/r300/r300_state.c @@ -608,7 +608,10 @@ static void r300ColorMask(GLcontext* ctx, GLboolean r, GLboolean g, GLboolean b, GLboolean a) { r300ContextPtr r300 = R300_CONTEXT(ctx); - int mask = (b << 0) | (g << 1) | (r << 2) | (a << 3); + int mask = (r ? R300_COLORMASK0_R : 0) | + (g ? R300_COLORMASK0_G : 0) | + (b ? R300_COLORMASK0_B : 0) | + (a ? R300_COLORMASK0_A : 0); if (mask != r300->hw.cmk.cmd[R300_CMK_COLORMASK]) { R300_STATECHANGE(r300, cmk);