From 365582dd6f632aafbc1c817aa57926d679bb2efc Mon Sep 17 00:00:00 2001 From: Michal Krol Date: Tue, 1 Aug 2006 20:07:31 +0000 Subject: Clean-up FEATURE_ARB_shader_objects #ifdefs. Bug 7492. --- src/mesa/tnl/t_pipeline.h | 2 ++ src/mesa/tnl/t_vb_arbshader.c | 4 ++++ 2 files changed, 6 insertions(+) (limited to 'src/mesa/tnl') 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 */ + -- cgit v1.2.3