diff options
| -rw-r--r-- | src/mesa/tnl/t_vb_fog.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_light.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_normals.c | 1 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_points.c | 6 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_texgen.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_texmat.c | 2 | 
6 files changed, 8 insertions, 7 deletions
| diff --git a/src/mesa/tnl/t_vb_fog.c b/src/mesa/tnl/t_vb_fog.c index 2ad41f5bbd..bbbf54baac 100644 --- a/src/mesa/tnl/t_vb_fog.c +++ b/src/mesa/tnl/t_vb_fog.c @@ -241,7 +241,7 @@ static void free_fog_data( struct tnl_pipeline_stage *stage )  const struct tnl_pipeline_stage _tnl_fog_coordinate_stage =  {     "build fog coordinates",	/* name */ -   _NEW_FOG,			/* check_state */ +   _NEW_FOG|_NEW_PROGRAM,	/* check_state */     _NEW_FOG,			/* run_state */     GL_FALSE,			/* active? */     0,				/* inputs */ diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c index 3ca25395da..1d260fafb2 100644 --- a/src/mesa/tnl/t_vb_light.c +++ b/src/mesa/tnl/t_vb_light.c @@ -352,7 +352,7 @@ static void dtr( struct tnl_pipeline_stage *stage )  const struct tnl_pipeline_stage _tnl_lighting_stage =  {     "lighting",			/* name */ -   _NEW_LIGHT,			/* recheck */ +   _NEW_LIGHT|_NEW_PROGRAM,			/* recheck */     _NEW_LIGHT|_NEW_MODELVIEW,	/* recalc -- modelview dependency  				 * otherwise not captured by inputs  				 * (which may be _TNL_BIT_POS) */ diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c index 2908f1aee0..2247313653 100644 --- a/src/mesa/tnl/t_vb_normals.c +++ b/src/mesa/tnl/t_vb_normals.c @@ -179,6 +179,7 @@ static void free_normal_data( struct tnl_pipeline_stage *stage )  #define _TNL_NEW_NORMAL_TRANSFORM        (_NEW_MODELVIEW| \  					  _NEW_TRANSFORM| \ +					  _NEW_PROGRAM| \                                            _MESA_NEW_NEED_NORMALS| \                                            _MESA_NEW_NEED_EYE_COORDS) diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c index 9ef98fab22..1990886479 100644 --- a/src/mesa/tnl/t_vb_points.c +++ b/src/mesa/tnl/t_vb_points.c @@ -111,10 +111,10 @@ static void free_point_data( struct tnl_pipeline_stage *stage )  const struct tnl_pipeline_stage _tnl_point_attenuation_stage =  {     "point size attenuation",	/* name */ -   _NEW_POINT,			/* build_state_change */ -   _NEW_POINT,			/* run_state_change */ +   _NEW_POINT|_NEW_PROGRAM,	/* check_state */ +   _NEW_POINT,			/* run_state */     GL_FALSE,			/* active */ -   _TNL_BIT_POS,			/* inputs */ +   _TNL_BIT_POS,		/* inputs */     _TNL_BIT_POS,		/* outputs */     0,				/* changed_inputs (temporary value) */     NULL,			/* stage private data */ diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c index 68ee089c09..64d569a019 100644 --- a/src/mesa/tnl/t_vb_texgen.c +++ b/src/mesa/tnl/t_vb_texgen.c @@ -678,7 +678,7 @@ static void free_texgen_data( struct tnl_pipeline_stage *stage )  const struct tnl_pipeline_stage _tnl_texgen_stage =  {     "texgen",			/* name */ -   _NEW_TEXTURE,		/* when to call check() */ +   _NEW_TEXTURE|_NEW_PROGRAM,	/* when to call check() */     _NEW_TEXTURE,		/* when to invalidate stored data */     GL_FALSE,			/* active? */     0,				/* inputs */ diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c index 363a76a487..221dd58280 100644 --- a/src/mesa/tnl/t_vb_texmat.c +++ b/src/mesa/tnl/t_vb_texmat.c @@ -137,7 +137,7 @@ static void free_texmat_data( struct tnl_pipeline_stage *stage )  const struct tnl_pipeline_stage _tnl_texture_transform_stage =  {     "texture transform",			/* name */ -   _NEW_TEXTURE|_NEW_TEXTURE_MATRIX,	/* check_state */ +   _NEW_TEXTURE|_NEW_TEXTURE_MATRIX|_NEW_PROGRAM,	/* check_state */     _NEW_TEXTURE|_NEW_TEXTURE_MATRIX,	/* run_state */     GL_FALSE,				/* active? */     0,					/* inputs */ | 
