diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-03 16:39:57 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2005-09-03 16:39:57 +0000 |
| commit | 7fa6c1afb9b85231c3b2e8c51672e9ca26efc070 (patch) | |
| tree | 2cf1ff150f6820a4dbb6ccc46d6065a768dcf435 /src/mesa/drivers/dri/r300/r300_texstate.c | |
| parent | 624ad14a581e9befdfda5335b775d8d1f55fbe56 (diff) | |
silence misc warnings
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_texstate.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index b06629ca13..22fbe2e18a 100644 --- a/src/mesa/drivers/dri/r300/r300_texstate.c +++ b/src/mesa/drivers/dri/r300/r300_texstate.c @@ -1035,9 +1035,9 @@ static GLboolean r300_validate_texgen(GLcontext * ctx, GLuint unit) static void disable_tex(GLcontext * ctx, int unit) { +#if 0 /* This needs to be redone.. or done elsewhere */ r300ContextPtr rmesa = R300_CONTEXT(ctx); -#if 0 /* This needs to be redone.. or done elsewhere */ if (rmesa->hw.ctx.cmd[CTX_PP_CNTL] & (R200_TEX_0_ENABLE << unit)) { /* Texture unit disabled */ if (rmesa->state.texture.unit[unit].texobj != NULL) { @@ -1339,10 +1339,12 @@ static GLboolean r300UpdateTextureUnit(GLcontext * ctx, int unit) void r300UpdateTextureState(GLcontext * ctx) { +#if 0 r300ContextPtr rmesa = R300_CONTEXT(ctx); - GLboolean ok; GLuint dbg; int i; +#endif + GLboolean ok; ok = (r300UpdateTextureUnit(ctx, 0) && r300UpdateTextureUnit(ctx, 1) && |