@@ -1,9 +1,8 @@ | |||
/* | |||
* Mesa 3-D graphics library | |||
* Version: 6.5 | |||
* Version: 6.5.3 | |||
* | |||
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved. | |||
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved. | |||
* | |||
* Permission is hereby granted, free of charge, to any person obtaining a | |||
* copy of this software and associated documentation files (the "Software"), | |||
@@ -204,16 +203,13 @@ const struct tnl_pipeline_stage *_tnl_default_pipeline[] = { | |||
&_tnl_texgen_stage, | |||
&_tnl_texture_transform_stage, | |||
&_tnl_point_attenuation_stage, | |||
#if defined(FEATURE_NV_vertex_program) || defined(FEATURE_ARB_vertex_program) | |||
&_tnl_arb_vertex_program_stage, | |||
&_tnl_vertex_program_stage, | |||
#endif | |||
&_tnl_render_stage, | |||
NULL | |||
}; | |||
const struct tnl_pipeline_stage *_tnl_vp_pipeline[] = { | |||
&_tnl_arb_vertex_program_stage, | |||
&_tnl_vertex_program_stage, | |||
&_tnl_render_stage, | |||
NULL | |||
}; |
@@ -1,9 +1,8 @@ | |||
/* | |||
* Mesa 3-D graphics library | |||
* Version: 6.5 | |||
* Version: 6.5.3 | |||
* | |||
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved. | |||
* Copyright (C) 1999-2007 Brian Paul All Rights Reserved. | |||
* | |||
* Permission is hereby granted, free of charge, to any person obtaining a | |||
* copy of this software and associated documentation files (the "Software"), | |||
@@ -52,11 +51,7 @@ extern const struct tnl_pipeline_stage _tnl_fog_coordinate_stage; | |||
extern const struct tnl_pipeline_stage _tnl_texgen_stage; | |||
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: |
@@ -44,6 +44,20 @@ | |||
/** | |||
* Called via ctx->Driver.ProgramStringNotify() after a new vertex program | |||
* string has been parsed. | |||
*/ | |||
void | |||
_tnl_program_string(GLcontext *ctx, GLenum target, struct gl_program *program) | |||
{ | |||
/* No-op. | |||
* If we had derived anything from the program that was private to this | |||
* stage we'd recompute/validate it here. | |||
*/ | |||
} | |||
/*! | |||
* Private storage for the vertex program pipeline stage. | |||
*/ |