aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Schultz <[email protected]>2001-09-18 15:27:18 +0000
committerKarl Schultz <[email protected]>2001-09-18 15:27:18 +0000
commit57c946096eecbc07b385e4473e04e5a0cafdc12d (patch)
tree4d42dc87fb7f01c8403358f53f50c96ec097a53a
parentfde5e2c5f182759aff78bdd12e6c928f3f13bbdc (diff)
compiler warnings
-rw-r--r--src/mesa/main/attrib.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 9b515c7a6bb..01a913955a9 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1,4 +1,4 @@
-/* $Id: attrib.c,v 1.56 2001/09/14 21:36:43 brianp Exp $ */
+/* $Id: attrib.c,v 1.57 2001/09/18 15:27:18 kschultz Exp $ */
/*
* Mesa 3-D graphics library
@@ -599,14 +599,14 @@ pop_texture_group(GLcontext *ctx, const struct gl_texture_attrib *texAttrib)
_mesa_ActiveTextureARB(GL_TEXTURE0_ARB + u);
_mesa_set_enable(ctx, GL_TEXTURE_1D,
- (GLboolean) (unit->Enabled & TEXTURE0_1D) ? GL_TRUE : GL_FALSE);
+ (GLboolean) (unit->Enabled & TEXTURE0_1D ? GL_TRUE : GL_FALSE));
_mesa_set_enable(ctx, GL_TEXTURE_2D,
- (GLboolean) (unit->Enabled & TEXTURE0_2D) ? GL_TRUE : GL_FALSE);
+ (GLboolean) (unit->Enabled & TEXTURE0_2D ? GL_TRUE : GL_FALSE));
_mesa_set_enable(ctx, GL_TEXTURE_3D,
- (GLboolean) (unit->Enabled & TEXTURE0_3D) ? GL_TRUE : GL_FALSE);
+ (GLboolean) (unit->Enabled & TEXTURE0_3D ? GL_TRUE : GL_FALSE));
if (ctx->Extensions.ARB_texture_cube_map) {
_mesa_set_enable(ctx, GL_TEXTURE_CUBE_MAP_ARB,
- (GLboolean) (unit->Enabled & TEXTURE0_CUBE) ? GL_TRUE : GL_FALSE);
+ (GLboolean) (unit->Enabled & TEXTURE0_CUBE ? GL_TRUE : GL_FALSE));
}
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, unit->EnvMode);
_mesa_TexEnvfv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_COLOR, unit->EnvColor);