diff options
author | Keith Whitwell <keith@tungstengraphics.com> | 2003-11-24 15:23:18 +0000 |
---|---|---|
committer | Keith Whitwell <keith@tungstengraphics.com> | 2003-11-24 15:23:18 +0000 |
commit | ae0eaf93e092ac8e8b1c98f3e986de96940663fa (patch) | |
tree | 56aae7c4b985f657384df5e088227c4dd08130fb /src/mesa/tnl/t_vb_normals.c | |
parent | 57c9814b9e87924696df4c741861c29d4236d1eb (diff) |
Merge vtx-0-2-branch
Diffstat (limited to 'src/mesa/tnl/t_vb_normals.c')
-rw-r--r-- | src/mesa/tnl/t_vb_normals.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c index 22c9729143..96a43f6884 100644 --- a/src/mesa/tnl/t_vb_normals.c +++ b/src/mesa/tnl/t_vb_normals.c @@ -52,7 +52,7 @@ struct normal_stage_data { static GLboolean run_normal_stage( GLcontext *ctx, - struct gl_pipeline_stage *stage ) + struct tnl_pipeline_stage *stage ) { struct normal_stage_data *store = NORMAL_STAGE_DATA(stage); struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb; @@ -83,7 +83,7 @@ static GLboolean run_normal_stage( GLcontext *ctx, static GLboolean run_validate_normal_stage( GLcontext *ctx, - struct gl_pipeline_stage *stage ) + struct tnl_pipeline_stage *stage ) { struct normal_stage_data *store = NORMAL_STAGE_DATA(stage); @@ -133,7 +133,7 @@ static GLboolean run_validate_normal_stage( GLcontext *ctx, static void check_normal_transform( GLcontext *ctx, - struct gl_pipeline_stage *stage ) + struct tnl_pipeline_stage *stage ) { stage->active = !ctx->VertexProgram.Enabled && (ctx->Light.Enabled || (ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS)); @@ -146,7 +146,7 @@ static void check_normal_transform( GLcontext *ctx, static GLboolean alloc_normal_data( GLcontext *ctx, - struct gl_pipeline_stage *stage ) + struct tnl_pipeline_stage *stage ) { TNLcontext *tnl = TNL_CONTEXT(ctx); struct normal_stage_data *store; @@ -165,7 +165,7 @@ static GLboolean alloc_normal_data( GLcontext *ctx, -static void free_normal_data( struct gl_pipeline_stage *stage ) +static void free_normal_data( struct tnl_pipeline_stage *stage ) { struct normal_stage_data *store = NORMAL_STAGE_DATA(stage); if (store) { @@ -182,14 +182,14 @@ static void free_normal_data( struct gl_pipeline_stage *stage ) -const struct gl_pipeline_stage _tnl_normal_transform_stage = +const struct tnl_pipeline_stage _tnl_normal_transform_stage = { "normal transform", /* name */ _TNL_NEW_NORMAL_TRANSFORM, /* re-check */ _TNL_NEW_NORMAL_TRANSFORM, /* re-run */ GL_FALSE, /* active? */ - VERT_BIT_NORMAL, /* inputs */ - VERT_BIT_NORMAL, /* outputs */ + _TNL_BIT_NORMAL, /* inputs */ + _TNL_BIT_NORMAL, /* outputs */ 0, /* changed_inputs */ NULL, /* private data */ free_normal_data, /* destructor */ |