diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2001-03-29 21:16:25 +0000 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2001-03-29 21:16:25 +0000 |
| commit | ed39a43b8cb2e1cf69b097fc89365cde470ebf51 (patch) | |
| tree | e886defa720e33ec795c7ffb7941fcab5c5b8e1d /src/mesa/main/enable.c | |
| parent | 2780ed4b978b32a08be6eecb0e923250e7b907ee (diff) | |
| download | external_mesa3d-ed39a43b8cb2e1cf69b097fc89365cde470ebf51.zip external_mesa3d-ed39a43b8cb2e1cf69b097fc89365cde470ebf51.tar.gz external_mesa3d-ed39a43b8cb2e1cf69b097fc89365cde470ebf51.tar.bz2 | |
Remove ENABLE_* flags, ctx->_Enabled.
Replace with ctx->Texture._TexMatEnabled, ctx->Texture._TexGenEnabled.
Diffstat (limited to 'src/mesa/main/enable.c')
| -rw-r--r-- | src/mesa/main/enable.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 4eff804..173b4b0 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1,4 +1,4 @@ -/* $Id: enable.c,v 1.47 2001/03/29 17:08:26 keithw Exp $ */ +/* $Id: enable.c,v 1.48 2001/03/29 21:16:25 keithw Exp $ */ /* * Mesa 3-D graphics library @@ -175,7 +175,6 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) ctx->Transform.ClipEnabled[p] = state; if (state) { - ctx->_Enabled |= ENABLE_USERCLIP; ctx->Transform._AnyClip++; if (ctx->ProjectionMatrix.flags & MAT_DIRTY) { @@ -189,9 +188,6 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) _mesa_transform_vector( ctx->Transform._ClipUserPlane[p], ctx->Transform.EyeUserPlane[p], ctx->ProjectionMatrix.inv ); - } else { - if (--ctx->Transform._AnyClip == 0) - ctx->_Enabled &= ~ENABLE_USERCLIP; } } break; @@ -235,7 +231,6 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) return; FLUSH_VERTICES(ctx, _NEW_FOG); ctx->Fog.Enabled = state; - ctx->_Enabled ^= ENABLE_FOG; break; case GL_HISTOGRAM: if (!ctx->Extensions.EXT_histogram && !ctx->Extensions.ARB_imaging) { @@ -272,7 +267,6 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) return; FLUSH_VERTICES(ctx, _NEW_LIGHT); ctx->Light.Enabled = state; - ctx->_Enabled ^= ENABLE_LIGHT; if ((ctx->Light.Enabled && ctx->Light.Model.ColorControl==GL_SEPARATE_SPECULAR_COLOR) @@ -427,7 +421,6 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) return; FLUSH_VERTICES(ctx, _NEW_TRANSFORM); ctx->Transform.Normalize = state; - ctx->_Enabled ^= ENABLE_NORMALIZE; break; case GL_POINT_SMOOTH: if (ctx->Point.SmoothFlag==state) @@ -474,7 +467,6 @@ void _mesa_set_enable( GLcontext *ctx, GLenum cap, GLboolean state ) return; FLUSH_VERTICES(ctx, _NEW_TRANSFORM); ctx->Transform.RescaleNormals = state; - ctx->_Enabled ^= ENABLE_RESCALE; break; case GL_SCISSOR_TEST: if (ctx->Scissor.Enabled==state) |