Add ARB_vertex_shader stage just before render stage.

If enabled, all other stages, except render, are disabled.

1 files changed, 10 insertions, 5 deletions

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 121fc2ec1ec..3206892d5be 100644
--- a/src/mesa/tnl/t_vb_arbprogram.c
+++ b/src/mesa/tnl/t_vb_arbprogram.c
@@ -1257,15 +1257,17 @@ static INLINE void call_func( struct tnl_compiled_program *p,
 static GLboolean
 run_arb_vertex_program(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 {
-   struct vertex_program *program = (ctx->VertexProgram._Enabled ?
-				     ctx->VertexProgram.Current :
-				     ctx->_TnlProgram);
+   struct vertex_program *program;
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
    struct arb_vp_machine *m = ARB_VP_MACHINE(stage);
    struct tnl_compiled_program *p;
    GLuint i, j;
    GLbitfield outputs;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
+   program = (ctx->VertexProgram._Enabled ? ctx->VertexProgram.Current : ctx->_TnlProgram);
    if (!program || program->IsNVProgram)
       return GL_TRUE;   
 
@@ -1408,9 +1410,12 @@ static void
 validate_vertex_program( GLcontext *ctx, struct tnl_pipeline_stage *stage )
 {
    struct arb_vp_machine *m = ARB_VP_MACHINE(stage);
-   struct vertex_program *program = 
-      (ctx->VertexProgram._Enabled ? ctx->VertexProgram.Current : 0);
+   struct vertex_program *program;
+
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return;
 
+   program = (ctx->VertexProgram._Enabled ? ctx->VertexProgram.Current : 0);
    if (!program && ctx->_MaintainTnlProgram) {
       program = ctx->_TnlProgram;
    }