Add ARB_vertex_shader stage just before render stage.

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

1 files changed, 8 insertions, 2 deletions

diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c
index 1deab4d43a6..d4c83189c24 100644
--- a/src/mesa/tnl/t_vb_light.c
+++ b/src/mesa/tnl/t_vb_light.c
@@ -1,8 +1,8 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
- * Copyright (C) 1999-2005  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"),
@@ -203,6 +203,9 @@ static GLboolean run_lighting( GLcontext *ctx,
    GLvector4f *input = ctx->_NeedEyeCoords ? VB->EyePtr : VB->ObjPtr;
    GLuint idx;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
    if (!ctx->Light.Enabled || ctx->VertexProgram._Enabled)
       return GL_TRUE;
 
@@ -261,6 +264,9 @@ static void validate_lighting( GLcontext *ctx,
 {
    light_func *tab;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return;
+
    if (!ctx->Light.Enabled || ctx->VertexProgram._Enabled)
       return;