diff options
| author | Brian Paul <[email protected]> | 2001-03-29 16:50:31 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2001-03-29 16:50:31 +0000 |
| commit | ee403ff0ba272f5be539ddc921d3fffb3d250cc4 (patch) | |
| tree | edcd3441d7b0991ed48be40646195b40eb8109a5 /src/mesa/swrast/s_context.c | |
| parent | 1b2fef5c28a40cd001598071e25b876ad4fccdd1 (diff) | |
Removed DD_Z_NEVER.
Replaced SEPERATE with SEPARATE.
Renumbered _NEW_ flags.
Removed _NEW_COLORTABLE.
Diffstat (limited to 'src/mesa/swrast/s_context.c')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index 20090bdb12e..c018bfc0a56 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -1,4 +1,4 @@ -/* $Id: s_context.c,v 1.18 2001/03/19 02:25:36 keithw Exp $ */ +/* $Id: s_context.c,v 1.19 2001/03/29 16:50:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -162,7 +162,7 @@ _swrast_update_hint( GLcontext *ctx ) _SWRAST_NEW_RASTERMASK| \ _NEW_LIGHT| \ _NEW_FOG | \ - _DD_NEW_SEPERATE_SPECULAR) + _DD_NEW_SEPARATE_SPECULAR) #define _SWRAST_NEW_LINE (_SWRAST_NEW_DERIVED | \ _NEW_RENDERMODE| \ @@ -171,7 +171,7 @@ _swrast_update_hint( GLcontext *ctx ) _NEW_LIGHT| \ _NEW_FOG| \ _NEW_DEPTH | \ - _DD_NEW_SEPERATE_SPECULAR) + _DD_NEW_SEPARATE_SPECULAR) #define _SWRAST_NEW_POINT (_SWRAST_NEW_DERIVED | \ _NEW_RENDERMODE | \ @@ -179,7 +179,7 @@ _swrast_update_hint( GLcontext *ctx ) _NEW_TEXTURE | \ _NEW_LIGHT | \ _NEW_FOG | \ - _DD_NEW_SEPERATE_SPECULAR) + _DD_NEW_SEPARATE_SPECULAR) #define _SWRAST_NEW_TEXTURE_SAMPLE_FUNC _NEW_TEXTURE @@ -201,7 +201,7 @@ _swrast_validate_triangle( GLcontext *ctx, _swrast_validate_derived( ctx ); swrast->choose_triangle( ctx ); - if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && + if ((ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) && !ctx->Texture._ReallyEnabled) { swrast->SpecTriangle = swrast->Triangle; swrast->Triangle = _swrast_add_spec_terms_triangle; @@ -218,7 +218,7 @@ _swrast_validate_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 ) _swrast_validate_derived( ctx ); swrast->choose_line( ctx ); - if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && + if ((ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) && !ctx->Texture._ReallyEnabled) { swrast->SpecLine = swrast->Line; swrast->Line = _swrast_add_spec_terms_line; @@ -236,7 +236,7 @@ _swrast_validate_point( GLcontext *ctx, const SWvertex *v0 ) _swrast_validate_derived( ctx ); swrast->choose_point( ctx ); - if ((ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) && + if ((ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) && !ctx->Texture._ReallyEnabled) { swrast->SpecPoint = swrast->Point; swrast->Point = _swrast_add_spec_terms_point; |