From 7fa6c1afb9b85231c3b2e8c51672e9ca26efc070 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 3 Sep 2005 16:39:57 +0000 Subject: silence misc warnings --- src/mesa/drivers/dri/r300/r300_texstate.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/mesa/drivers/dri/r300/r300_texstate.c') diff --git a/src/mesa/drivers/dri/r300/r300_texstate.c b/src/mesa/drivers/dri/r300/r300_texstate.c index b06629ca13a..22fbe2e18a0 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) && -- cgit v1.2.3