diff options
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_aatriangle.c | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_context.c | 14 | ||||
| -rw-r--r-- | src/mesa/swrast/s_context.h | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_lines.c | 4 | ||||
| -rw-r--r-- | src/mesa/swrast/s_triangle.c | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/src/mesa/swrast/s_aatriangle.c b/src/mesa/swrast/s_aatriangle.c index b64424e39a1..93f65b826cc 100644 --- a/src/mesa/swrast/s_aatriangle.c +++ b/src/mesa/swrast/s_aatriangle.c @@ -1,4 +1,4 @@ -/* $Id: s_aatriangle.c,v 1.11 2001/03/28 21:37:24 brianp Exp $ */ +/* $Id: s_aatriangle.c,v 1.12 2001/03/29 16:50:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -406,7 +406,7 @@ _mesa_set_aa_triangle_function(GLcontext *ctx) ASSERT(ctx->Polygon.SmoothFlag); if (ctx->Texture._ReallyEnabled) { - if (ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) { + if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) { if (swrast->_MultiTextureEnabled) { SWRAST_CONTEXT(ctx)->Triangle = spec_multitex_aa_tri; } 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; diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h index 3bf9616d51f..25a16f28b82 100644 --- a/src/mesa/swrast/s_context.h +++ b/src/mesa/swrast/s_context.h @@ -1,4 +1,4 @@ -/* $Id: s_context.h,v 1.8 2001/03/19 02:25:36 keithw Exp $ */ +/* $Id: s_context.h,v 1.9 2001/03/29 16:50:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -152,7 +152,7 @@ typedef struct swrast_line_func Line; swrast_tri_func Triangle; - /* Placeholders for when seperate specular (or secondary color) is + /* Placeholders for when separate specular (or secondary color) is * enabled but texturing is not. */ swrast_point_func SpecPoint; diff --git a/src/mesa/swrast/s_lines.c b/src/mesa/swrast/s_lines.c index 48d04115cc2..8971993ef56 100644 --- a/src/mesa/swrast/s_lines.c +++ b/src/mesa/swrast/s_lines.c @@ -1,4 +1,4 @@ -/* $Id: s_lines.c,v 1.14 2001/03/12 00:48:42 gareth Exp $ */ +/* $Id: s_lines.c,v 1.15 2001/03/29 16:50:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -1019,7 +1019,7 @@ _swrast_choose_line( GLcontext *ctx ) } else if (ctx->Texture._ReallyEnabled) { if (swrast->_MultiTextureEnabled || - (ctx->_TriangleCaps & DD_SEPERATE_SPECULAR)) { + (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)) { /* multi-texture and/or separate specular color */ if (ctx->Light.ShadeModel==GL_SMOOTH) swrast->Line = smooth_multitextured_line; diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c index 2375aafd591..e61b5765926 100644 --- a/src/mesa/swrast/s_triangle.c +++ b/src/mesa/swrast/s_triangle.c @@ -1,4 +1,4 @@ -/* $Id: s_triangle.c,v 1.23 2001/03/28 21:31:24 brianp Exp $ */ +/* $Id: s_triangle.c,v 1.24 2001/03/29 16:50:32 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -2387,7 +2387,7 @@ _swrast_choose_triangle( GLcontext *ctx ) if (swrast->_MultiTextureEnabled) { USE(lambda_multitextured_triangle); } - else if (ctx->_TriangleCaps & DD_SEPERATE_SPECULAR) { + else if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR) { /* separate specular color interpolation */ if (needLambda) { USE(lambda_textured_spec_triangle); |