Roel Kluin
2008-Jan-24 00:39 UTC
[Nouveau] [PATCH] more logical/bitand typos in nv10ColorMask(), nv10_state.c
more logical/bitand typos
Signed-off-by: Roel Kluin <12o3l at tiscali.nl>
---
diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c
b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 3e5bfe0..df074b6 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -140,7 +140,7 @@ static void nv10ColorMask(GLcontext *ctx, GLboolean rmask,
GLboolean gmask,
{
nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_COLOR_MASK, 1);
- OUT_RING_CACHE(((amask && 0x01) << 24) | ((rmask &&
0x01) << 16) | ((gmask && 0x01)<< 8) | ((bmask &&
0x01) << 0));
+ OUT_RING_CACHE(((amask & 0x01) << 24) | ((rmask & 0x01) <<
16) | ((gmask & 0x01)<< 8) | ((bmask & 0x01) << 0));
}
static void nv10ColorMaterial(GLcontext *ctx, GLenum face, GLenum mode)