diff options
| author | Michal Krol <mjkrol@gmail.org> | 2006-08-01 20:07:31 +0000 |
|---|---|---|
| committer | Michal Krol <mjkrol@gmail.org> | 2006-08-01 20:07:31 +0000 |
| commit | 365582dd6f632aafbc1c817aa57926d679bb2efc (patch) | |
| tree | 75f3184e471793c06cd16ef1bdd3e10629f2a28a /src/mesa/tnl | |
| parent | cc738e004f083566f3e1723f72623ef9875f72ec (diff) | |
Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492.
Diffstat (limited to 'src/mesa/tnl')
| -rw-r--r-- | src/mesa/tnl/t_pipeline.h | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_vb_arbshader.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/mesa/tnl/t_pipeline.h b/src/mesa/tnl/t_pipeline.h index e5622c9d56..b987ba4116 100644 --- a/src/mesa/tnl/t_pipeline.h +++ b/src/mesa/tnl/t_pipeline.h @@ -54,7 +54,9 @@ extern const struct tnl_pipeline_stage _tnl_texture_transform_stage; extern const struct tnl_pipeline_stage _tnl_point_attenuation_stage; extern const struct tnl_pipeline_stage _tnl_arb_vertex_program_stage; extern const struct tnl_pipeline_stage _tnl_vertex_program_stage; +#if FEATURE_ARB_vertex_shader extern const struct tnl_pipeline_stage _tnl_arb_vertex_shader_stage; +#endif extern const struct tnl_pipeline_stage _tnl_render_stage; /* Shorthand to plug in the default pipeline: diff --git a/src/mesa/tnl/t_vb_arbshader.c b/src/mesa/tnl/t_vb_arbshader.c index 174d798543..13aa3ea910 100644 --- a/src/mesa/tnl/t_vb_arbshader.c +++ b/src/mesa/tnl/t_vb_arbshader.c @@ -34,6 +34,8 @@ #include "slang_utility.h" #include "slang_link.h" +#if FEATURE_ARB_vertex_shader + typedef struct { GLvector4f outputs[VERT_RESULT_MAX]; @@ -295,3 +297,5 @@ const struct tnl_pipeline_stage _tnl_arb_vertex_shader_stage = { run_arb_vertex_shader }; +#endif /* FEATURE_ARB_vertex_shader */ + |