Add ARB_vertex_shader stage just before render stage.

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

1 files changed, 5 insertions, 2 deletions

diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 297b731b1dd..3908997d71c 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.1
+ * Version:  6.5
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  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"),
@@ -80,6 +80,9 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
    struct vertex_program *program = ctx->VertexProgram.Current;
    GLuint i;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
    if (!ctx->VertexProgram._Enabled ||
        !program->IsNVProgram)
       return GL_TRUE;