summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2001-03-29 16:50:31 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2001-03-29 16:50:31 +0000
commitee403ff0ba272f5be539ddc921d3fffb3d250cc4 (patch)
treeedcd3441d7b0991ed48be40646195b40eb8109a5 /src/mesa/tnl
parent1b2fef5c28a40cd001598071e25b876ad4fccdd1 (diff)
Removed DD_Z_NEVER.
Replaced SEPERATE with SEPARATE. Renumbered _NEW_ flags. Removed _NEW_COLORTABLE.
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_vb_render.c6
-rw-r--r--src/mesa/tnl/t_vb_vertex.c14
2 files changed, 9 insertions, 11 deletions
diff --git a/src/mesa/tnl/t_vb_render.c b/src/mesa/tnl/t_vb_render.c
index 95bc403e70..42d00e52da 100644
--- a/src/mesa/tnl/t_vb_render.c
+++ b/src/mesa/tnl/t_vb_render.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_render.c,v 1.16 2001/03/19 02:25:37 keithw Exp $ */
+/* $Id: t_vb_render.c,v 1.17 2001/03/29 16:50:33 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -360,7 +360,7 @@ static void check_render( GLcontext *ctx, struct gl_pipeline_stage *stage )
if (ctx->Visual.rgbMode) {
inputs |= VERT_RGBA;
- if (ctx->_TriangleCaps & DD_SEPERATE_SPECULAR)
+ if (ctx->_TriangleCaps & DD_SEPARATE_SPECULAR)
inputs |= VERT_SPEC_RGB;
if (ctx->Texture._ReallyEnabled) {
@@ -403,7 +403,7 @@ const struct gl_pipeline_stage _tnl_render_stage =
{
"render",
(_NEW_BUFFERS |
- _DD_NEW_SEPERATE_SPECULAR |
+ _DD_NEW_SEPARATE_SPECULAR |
_DD_NEW_FLATSHADE |
_NEW_TEXTURE|
_NEW_LIGHT|
diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index ab08ac23c3..c52047f3e8 100644
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.c
@@ -1,4 +1,4 @@
-/* $Id: t_vb_vertex.c,v 1.7 2001/03/12 00:48:44 gareth Exp $ */
+/* $Id: t_vb_vertex.c,v 1.8 2001/03/29 16:50:33 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -137,12 +137,10 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
TNLcontext *tnl = TNL_CONTEXT(ctx);
struct vertex_buffer *VB = &tnl->vb;
- if (stage->changed_inputs)
- {
-/* VB->ObjPtr->size = 4; */
+ if (stage->changed_inputs) {
if (ctx->_NeedEyeCoords) {
- /* Seperate modelview and project transformations:
+ /* Separate modelview and project transformations:
*/
if (ctx->ModelView.type == MATRIX_IDENTITY)
VB->EyePtr = VB->ObjPtr;
@@ -156,14 +154,14 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
VB->ClipPtr = TransformRaw( &store->clip, &ctx->ProjectionMatrix,
VB->EyePtr );
}
- else
- {
+ else {
/* Combined modelviewproject transform:
*/
if (ctx->_ModelProjectMatrix.type == MATRIX_IDENTITY)
VB->ClipPtr = VB->ObjPtr;
else
- VB->ClipPtr = TransformRaw( &store->clip, &ctx->_ModelProjectMatrix,
+ VB->ClipPtr = TransformRaw( &store->clip,
+ &ctx->_ModelProjectMatrix,
VB->ObjPtr );
}