Add ARB_vertex_shader stage just before render stage.

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

diff --git a/src/mesa/tnl/t_pipeline.c b/src/mesa/tnl/t_pipeline.c
index 2a87f950ce23fc0859d304e75ad795edd9ddd37f..0b579a7b24bc81b92b5a5bbaed29f86ae83c5548 100644 (file)
--- a/src/mesa/tnl/t_pipeline.c
+++ b/src/mesa/tnl/t_pipeline.c
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.5
  *
- * Copyright (C) 1999-2003  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"),
@@ -210,6 +210,9 @@ const struct tnl_pipeline_stage *_tnl_default_pipeline[] = {
 #if defined(FEATURE_NV_vertex_program) || defined(FEATURE_ARB_vertex_program)
    &_tnl_arb_vertex_program_stage,
    &_tnl_vertex_program_stage, 
+#endif
+#if FEATURE_ARB_vertex_shader
+   &_tnl_arb_vertex_shader_stage,
 #endif
    &_tnl_render_stage,
    NULL 

diff --git a/src/mesa/tnl/t_pipeline.h b/src/mesa/tnl/t_pipeline.h
index 6c7a0814c56c2321ff4e2e820a14cda8517c29c0..e5622c9d5664fb1c420c5671357c77489683044f 100644 (file)
--- a/src/mesa/tnl/t_pipeline.h
+++ b/src/mesa/tnl/t_pipeline.h
@@ -1,9 +1,9 @@
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.5
+ * Version:  6.5
  *
- * Copyright (C) 1999-2001  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"),
@@ -54,6 +54,7 @@ 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;
+extern const struct tnl_pipeline_stage _tnl_arb_vertex_shader_stage;
 extern const struct tnl_pipeline_stage _tnl_render_stage;
 
 /* Shorthand to plug in the default pipeline:

diff --git a/src/mesa/tnl/t_vb_arbprogram.c b/src/mesa/tnl/t_vb_arbprogram.c
index 121fc2ec1ec71623eff4ce35b965e7b0fdd9a2f1..3206892d5be92285fddaf1e9373c904e56bc4dc8 100644 (file)
--- 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;
    }

diff --git a/src/mesa/tnl/t_vb_arbshader.c b/src/mesa/tnl/t_vb_arbshader.c
new file mode 100644 (file)
index 0000000..d779e44
--- /dev/null
+++ b/src/mesa/tnl/t_vb_arbshader.c
@@ -0,0 +1,328 @@
+/*\r
+ * Mesa 3-D graphics library\r
+ * Version:  6.5\r
+ *\r
+ * Copyright (C) 2006  Brian Paul   All Rights Reserved.\r
+ *\r
+ * Permission is hereby granted, free of charge, to any person obtaining a\r
+ * copy of this software and associated documentation files (the "Software"),\r
+ * to deal in the Software without restriction, including without limitation\r
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,\r
+ * and/or sell copies of the Software, and to permit persons to whom the\r
+ * Software is furnished to do so, subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included\r
+ * in all copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS\r
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL\r
+ * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN\r
+ * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\r
+ *\r
+ * Authors:\r
+ *    Michal Krol\r
+ */\r
+\r
+#include "glheader.h"\r
+#include "imports.h"\r
+#include "macros.h"\r
+#include "shaderobjects.h"\r
+#include "t_pipeline.h"\r
+#include "slang_utility.h"\r
+\r
+typedef struct\r
+{\r
+       GLvector4f outputs[VERT_RESULT_MAX];\r
+       GLvector4f ndc_coords;\r
+       GLubyte *clipmask;\r
+       GLubyte ormask;\r
+       GLubyte andmask;\r
+} arbvs_stage_data;\r
+\r
+#define ARBVS_STAGE_DATA(stage) ((arbvs_stage_data *) stage->privatePtr)\r
+\r
+static GLboolean construct_arb_vertex_shader (GLcontext *ctx, struct tnl_pipeline_stage *stage)\r
+{\r
+       TNLcontext *tnl = TNL_CONTEXT(ctx);\r
+       struct vertex_buffer *vb = &tnl->vb;\r
+       arbvs_stage_data *store;\r
+       GLuint size = vb->Size;\r
+       GLuint i;\r
+\r
+       stage->privatePtr = _mesa_malloc (sizeof (arbvs_stage_data));\r
+       store = ARBVS_STAGE_DATA(stage);\r
+       if (store == NULL)\r
+               return GL_FALSE;\r
+\r
+       for (i = 0; i < VERT_RESULT_MAX; i++)\r
+       {\r
+               _mesa_vector4f_alloc (&store->outputs[i], 0, size, 32);\r
+               store->outputs[i].size = 4;\r
+       }\r
+       _mesa_vector4f_alloc (&store->ndc_coords, 0, size, 32);\r
+       store->clipmask = (GLubyte *) ALIGN_MALLOC (size, 32);\r
+\r
+       return GL_TRUE;\r
+}\r
+\r
+static void destruct_arb_vertex_shader (struct tnl_pipeline_stage *stage)\r
+{\r
+       arbvs_stage_data *store = ARBVS_STAGE_DATA(stage);\r
+\r
+       if (store != NULL)\r
+       {\r
+               GLuint i;\r
+\r
+               for (i = 0; i < VERT_RESULT_MAX; i++)\r
+                       _mesa_vector4f_free (&store->outputs[i]);\r
+               _mesa_vector4f_free (&store->ndc_coords);\r
+               ALIGN_FREE (store->clipmask);\r
+\r
+               _mesa_free (store);\r
+               stage->privatePtr = NULL;\r
+       }\r
+}\r
+\r
+static void validate_arb_vertex_shader (GLcontext *ctx, struct tnl_pipeline_stage *stage)\r
+{\r
+}\r
+\r
+/* XXX */\r
+extern void exec_vertex_shader (struct gl2_vertex_shader_intf **vs);\r
+extern int _slang_fetch_float (struct gl2_vertex_shader_intf **, const char *, GLfloat *, int);\r
+extern int _slang_fetch_vec3 (struct gl2_vertex_shader_intf **, const char *, GLfloat *, int);\r
+extern int _slang_fetch_vec4 (struct gl2_vertex_shader_intf **, const char *, GLfloat *, GLuint, int);\r
+extern int _slang_fetch_mat4 (struct gl2_vertex_shader_intf **, const char *, GLfloat *, GLuint, int);\r
+\r
+static void fetch_input_float (const char *name, GLuint attr, GLuint i, struct vertex_buffer *vb,\r
+       struct gl2_vertex_shader_intf **vs)\r
+{\r
+       const GLubyte *ptr = (const GLubyte *) vb->AttribPtr[attr]->data;\r
+       const GLuint size = vb->AttribPtr[attr]->size;\r
+       const GLuint stride = vb->AttribPtr[attr]->stride;\r
+       const GLfloat *data = (const GLfloat *) (ptr + stride * i);\r
+       float vec[1];\r
+\r
+       vec[0] = data[0];\r
+       _slang_fetch_float (vs, name, vec, 1);\r
+}\r
+\r
+static void fetch_input_vec3 (const char *name, GLuint attr, GLuint i, struct vertex_buffer *vb,\r
+       struct gl2_vertex_shader_intf **vs)\r
+{\r
+       const GLubyte *ptr = (const GLubyte *) vb->AttribPtr[attr]->data;\r
+       const GLuint size = vb->AttribPtr[attr]->size;\r
+       const GLuint stride = vb->AttribPtr[attr]->stride;\r
+       const GLfloat *data = (const GLfloat *) (ptr + stride * i);\r
+       float vec[3];\r
+\r
+       vec[0] = data[0];\r
+       vec[1] = data[1];\r
+       vec[2] = data[2];\r
+       _slang_fetch_vec3 (vs, name, vec, 1);\r
+}\r
+\r
+static void fetch_input_vec4 (const char *name, GLuint attr, GLuint i, struct vertex_buffer *vb,\r
+       struct gl2_vertex_shader_intf **vs)\r
+{\r
+       const GLubyte *ptr = (const GLubyte *) vb->AttribPtr[attr]->data;\r
+       const GLuint size = vb->AttribPtr[attr]->size;\r
+       const GLuint stride = vb->AttribPtr[attr]->stride;\r
+       const GLfloat *data = (const GLfloat *) (ptr + stride * i);\r
+       float vec[4];\r
+\r
+       switch (size)\r
+       {\r
+       case 2:\r
+               vec[0] = data[0];\r
+               vec[1] = data[1];\r
+               vec[2] = 0.0f;\r
+               vec[3] = 1.0f;\r
+               break;\r
+       case 3:\r
+               vec[0] = data[0];\r
+               vec[1] = data[1];\r
+               vec[2] = data[2];\r
+               vec[3] = 1.0f;\r
+               break;\r
+       case 4:\r
+               vec[0] = data[0];\r
+               vec[1] = data[1];\r
+               vec[2] = data[2];\r
+               vec[3] = data[3];\r
+               break;\r
+       }\r
+       _slang_fetch_vec4 (vs, name, vec, 0, 1);\r
+}\r
+\r
+static void fetch_output_float (const char *name, GLuint attr, GLuint i, arbvs_stage_data *store,\r
+       struct gl2_vertex_shader_intf **vs)\r
+{\r
+       float vec[1];\r
+\r
+       _slang_fetch_float (vs, name, vec, 0);\r
+       _mesa_memcpy (&store->outputs[attr].data[i], vec, 4);\r
+}\r
+\r
+static void fetch_output_vec4 (const char *name, GLuint attr, GLuint i, GLuint index,\r
+       arbvs_stage_data *store, struct gl2_vertex_shader_intf **vs)\r
+{\r
+       float vec[4];\r
+\r
+       _slang_fetch_vec4 (vs, name, vec, index, 0);\r
+       _mesa_memcpy (&store->outputs[attr].data[i], vec, 16);\r
+}\r
+\r
+static void fetch_uniform_mat4 (const char *name, const GLmatrix *matrix, GLuint index,\r
+       struct gl2_vertex_shader_intf **vs)\r
+{\r
+       _slang_fetch_mat4 (vs, name, matrix->m, index, 1);\r
+}\r
+\r
+static GLboolean run_arb_vertex_shader (GLcontext *ctx, struct tnl_pipeline_stage *stage)\r
+{\r
+       TNLcontext *tnl = TNL_CONTEXT(ctx);\r
+       struct vertex_buffer *vb = &tnl->vb;\r
+       arbvs_stage_data *store = ARBVS_STAGE_DATA(stage);\r
+       struct gl2_program_intf **prog;\r
+       struct gl2_vertex_shader_intf **vs = NULL;\r
+       GLsizei count, i, j;\r
+\r
+       prog = ctx->ShaderObjects.CurrentProgram;\r
+       if (prog == NULL)\r
+               return GL_TRUE;\r
+\r
+       count = (**prog)._container.GetAttachedCount ((struct gl2_container_intf **) prog);\r
+       for (i = 0; i < count; i++)\r
+       {\r
+               struct gl2_generic_intf **obj;\r
+               struct gl2_unknown_intf **unk;\r
+\r
+               obj = (**prog)._container.GetAttached ((struct gl2_container_intf **) prog, i);\r
+               unk = (**obj)._unknown.QueryInterface ((struct gl2_unknown_intf **) obj, UIID_VERTEX_SHADER);\r
+               (**obj)._unknown.Release ((struct gl2_unknown_intf **) obj);\r
+               if (unk != NULL)\r
+               {\r
+                       vs = (struct gl2_vertex_shader_intf **) unk;\r
+                       break;\r
+               }\r
+       }\r
+       if (vs == NULL)\r
+               return GL_TRUE;\r
+\r
+       fetch_uniform_mat4 ("gl_ModelViewMatrix", ctx->ModelviewMatrixStack.Top, 0, vs);\r
+       fetch_uniform_mat4 ("gl_ProjectionMatrix", ctx->ProjectionMatrixStack.Top, 0, vs);\r
+       fetch_uniform_mat4 ("gl_ModelViewProjectionMatrix", &ctx->_ModelProjectMatrix, 0, vs);\r
+       for (j = 0; j < 8; j++)\r
+               fetch_uniform_mat4 ("gl_TextureMatrix", ctx->TextureMatrixStack[j].Top, j, vs);\r
+       /* XXX: fetch uniform mat3 gl_NormalMatrix */\r
+       /* XXX: fetch uniform mat4 gl_ModelViewMatrixInverse */\r
+       /* XXX: fetch uniform mat4 gl_ProjectionMatrixInverse */\r
+       /* XXX: fetch uniform mat4 gl_ModelViewProjectionMatrixInverse */\r
+       /* XXX: fetch uniform mat4 gl_TextureMatrixInverse */\r
+       /* XXX: fetch uniform mat4 gl_ModelViewMatrixTranspose */\r
+       /* XXX: fetch uniform mat4 gl_ProjectionMatrixTranspose */\r
+       /* XXX: fetch uniform mat4 gl_ModelViewProjectionMatrixTranspose */\r
+       /* XXX: fetch uniform mat4 gl_TextureMatrixTranspose */\r
+       /* XXX: fetch uniform mat4 gl_ModelViewMatrixInverseTranspose */\r
+       /* XXX: fetch uniform mat4 gl_ProjectionMatrixInverseTranspose */\r
+       /* XXX: fetch uniform mat4 gl_ModelViewProjectionMatrixInverseTranspose */\r
+       /* XXX: fetch uniform mat4 gl_TextureMatrixInverseTranspose */\r
+       /* XXX: fetch uniform float gl_NormalScale */\r
+       /* XXX: fetch uniform mat4 gl_ClipPlane */\r
+       /* XXX: fetch uniform mat4 gl_TextureEnvColor */\r
+       /* XXX: fetch uniform mat4 gl_EyePlaneS */\r
+       /* XXX: fetch uniform mat4 gl_EyePlaneT */\r
+       /* XXX: fetch uniform mat4 gl_EyePlaneR */\r
+       /* XXX: fetch uniform mat4 gl_EyePlaneQ */\r
+       /* XXX: fetch uniform mat4 gl_ObjectPlaneS */\r
+       /* XXX: fetch uniform mat4 gl_ObjectPlaneT */\r
+       /* XXX: fetch uniform mat4 gl_ObjectPlaneR */\r
+       /* XXX: fetch uniform mat4 gl_ObjectPlaneQ */\r
+\r
+       for (i = 0; i < vb->Count; i++)\r
+       {\r
+               fetch_input_vec4 ("gl_Vertex", _TNL_ATTRIB_POS, i, vb, vs);\r
+               fetch_input_vec3 ("gl_Normal", _TNL_ATTRIB_NORMAL, i, vb, vs);\r
+               fetch_input_vec4 ("gl_Color", _TNL_ATTRIB_COLOR0, i, vb, vs);\r
+               fetch_input_vec4 ("gl_SecondaryColor", _TNL_ATTRIB_COLOR1, i, vb, vs);\r
+               fetch_input_float ("gl_FogCoord", _TNL_ATTRIB_FOG, i, vb, vs);\r
+               fetch_input_vec4 ("gl_MultiTexCoord0", _TNL_ATTRIB_TEX0, i, vb, vs);\r
+               fetch_input_vec4 ("gl_MultiTexCoord1", _TNL_ATTRIB_TEX1, i, vb, vs);\r
+               fetch_input_vec4 ("gl_MultiTexCoord2", _TNL_ATTRIB_TEX2, i, vb, vs);\r
+               fetch_input_vec4 ("gl_MultiTexCoord3", _TNL_ATTRIB_TEX3, i, vb, vs);\r
+               fetch_input_vec4 ("gl_MultiTexCoord4", _TNL_ATTRIB_TEX4, i, vb, vs);\r
+               fetch_input_vec4 ("gl_MultiTexCoord5", _TNL_ATTRIB_TEX5, i, vb, vs);\r
+               fetch_input_vec4 ("gl_MultiTexCoord6", _TNL_ATTRIB_TEX6, i, vb, vs);\r
+               fetch_input_vec4 ("gl_MultiTexCoord7", _TNL_ATTRIB_TEX7, i, vb, vs);\r
+\r
+               exec_vertex_shader (vs);\r
+\r
+               fetch_output_vec4 ("gl_Position", VERT_RESULT_HPOS, i, 0, store, vs);\r
+               fetch_output_vec4 ("gl_FrontColor", VERT_RESULT_COL0, i, 0, store, vs);\r
+               fetch_output_vec4 ("gl_FrontSecondaryColor", VERT_RESULT_COL1, i, 0, store, vs);\r
+               fetch_output_float ("gl_FogFragCoord", VERT_RESULT_FOGC, i, store, vs);\r
+               for (j = 0; j < 8; j++)\r
+                       fetch_output_vec4 ("gl_TexCoord", VERT_RESULT_TEX0 + j, i, j, store, vs);\r
+               fetch_output_float ("gl_PointSize", VERT_RESULT_PSIZ, i, store, vs);\r
+               fetch_output_vec4 ("gl_BackColor", VERT_RESULT_BFC0, i, 0, store, vs);\r
+               fetch_output_vec4 ("gl_BackSecondaryColor", VERT_RESULT_BFC1, i, 0, store, vs);\r
+               /* XXX: fetch output gl_ClipVertex */\r
+       }\r
+\r
+       (**vs)._shader._generic._unknown.Release ((struct gl2_unknown_intf **) vs);\r
+\r
+       vb->ClipPtr = &store->outputs[VERT_RESULT_HPOS];\r
+       vb->ClipPtr->count = vb->Count;\r
+       vb->ColorPtr[0] = &store->outputs[VERT_RESULT_COL0];\r
+       vb->SecondaryColorPtr[0] = &store->outputs[VERT_RESULT_COL1];\r
+       for (i = 0; i < ctx->Const.MaxTextureUnits; i++)\r
+               vb->TexCoordPtr[i] = &store->outputs[VERT_RESULT_TEX0 + i];\r
+       vb->ColorPtr[1] = &store->outputs[VERT_RESULT_BFC0];\r
+       vb->SecondaryColorPtr[1] = &store->outputs[VERT_RESULT_BFC1];\r
+       vb->FogCoordPtr = &store->outputs[VERT_RESULT_FOGC];\r
+       vb->PointSizePtr = &store->outputs[VERT_RESULT_PSIZ];\r
+\r
+       vb->AttribPtr[VERT_ATTRIB_COLOR0] = vb->ColorPtr[0];\r
+       vb->AttribPtr[VERT_ATTRIB_COLOR1] = vb->SecondaryColorPtr[0];\r
+       vb->AttribPtr[VERT_ATTRIB_FOG] = vb->FogCoordPtr;\r
+       for (i = 0; i < ctx->Const.MaxTextureUnits; i++)\r
+               vb->AttribPtr[VERT_ATTRIB_TEX0 + i] = vb->TexCoordPtr[i];\r
+       vb->AttribPtr[_TNL_ATTRIB_POINTSIZE] = &store->outputs[VERT_RESULT_PSIZ];\r
+\r
+       store->ormask = 0;\r
+       store->andmask = CLIP_ALL_BITS;\r
+\r
+       if (tnl->NeedNdcCoords)\r
+       {\r
+               vb->NdcPtr = _mesa_clip_tab[vb->ClipPtr->size] (vb->ClipPtr, &store->ndc_coords,\r
+                       store->clipmask, &store->ormask, &store->andmask);\r
+       }\r
+       else\r
+       {\r
+               vb->NdcPtr = NULL;\r
+               _mesa_clip_np_tab[vb->ClipPtr->size] (vb->ClipPtr, NULL, store->clipmask, &store->ormask,\r
+                       &store->andmask);\r
+       }\r
+\r
+       if (store->andmask)\r
+               return GL_FALSE;\r
+\r
+       vb->ClipAndMask = store->andmask;\r
+       vb->ClipOrMask = store->ormask;\r
+       vb->ClipMask = store->clipmask;\r
+\r
+       return GL_TRUE;\r
+}\r
+\r
+const struct tnl_pipeline_stage _tnl_arb_vertex_shader_stage = {\r
+       "ARB_vertex_shader",\r
+       NULL,\r
+       construct_arb_vertex_shader,\r
+       destruct_arb_vertex_shader,\r
+       validate_arb_vertex_shader,\r
+       run_arb_vertex_shader\r
+};\r
+\r

diff --git a/src/mesa/tnl/t_vb_cull.c b/src/mesa/tnl/t_vb_cull.c
index 3f12945707fcb987cd7f5c8047d86207b5cdd3c7..3a022e84c463baa7f63d9ca8799f51838f2b135f 100644 (file)
--- a/src/mesa/tnl/t_vb_cull.c
+++ b/src/mesa/tnl/t_vb_cull.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"),
@@ -57,6 +57,9 @@ static GLboolean run_cull_stage( GLcontext *ctx,
    GLuint count = VB->Count;
    GLuint i;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
    if (ctx->VertexProgram._Enabled ||
        !ctx->Transform.CullVertexFlag) 
       return GL_TRUE;

diff --git a/src/mesa/tnl/t_vb_fog.c b/src/mesa/tnl/t_vb_fog.c
index f1d01bc47f9192d036810f6d8cceb3aec85fd707..2bd9824dc0febaee7efa8dc1ebed1c59bddbc5c2 100644 (file)
--- a/src/mesa/tnl/t_vb_fog.c
+++ b/src/mesa/tnl/t_vb_fog.c
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * 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"),
@@ -148,6 +148,9 @@ run_fog_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
    struct fog_stage_data *store = FOG_STAGE_DATA(stage);
    GLvector4f *input;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
    if (!ctx->Fog.Enabled || ctx->VertexProgram._Enabled)
       return GL_TRUE;
 

diff --git a/src/mesa/tnl/t_vb_light.c b/src/mesa/tnl/t_vb_light.c
index 1deab4d43a6a45a14982bf78bd5593eb8afd7e69..d4c83189c2445b13303070e6580c386ef5c305ad 100644 (file)
--- 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;
 

diff --git a/src/mesa/tnl/t_vb_normals.c b/src/mesa/tnl/t_vb_normals.c
index 7ac33f8bec4cb171b52a7bae74a2cb3b0610935d..e87a67981e2ec17b46a38885a032fdfceaf3fc53 100644 (file)
--- a/src/mesa/tnl/t_vb_normals.c
+++ b/src/mesa/tnl/t_vb_normals.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"),
@@ -95,6 +95,11 @@ validate_normal_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 {
    struct normal_stage_data *store = NORMAL_STAGE_DATA(stage);
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL) {
+      store->NormalTransform = NULL;
+      return;
+   }
+
    if (ctx->VertexProgram._Enabled ||
        (!ctx->Light.Enabled &&
        !(ctx->Texture._GenFlags & TEXGEN_NEED_NORMALS))) {

diff --git a/src/mesa/tnl/t_vb_points.c b/src/mesa/tnl/t_vb_points.c
index 47c37930d570a72a50a690e5290c78e2eb3dda5f..d7f9ad687e803b509244bc6fb15cfec1f1693607 100644 (file)
--- a/src/mesa/tnl/t_vb_points.c
+++ b/src/mesa/tnl/t_vb_points.c
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * 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"),
@@ -47,6 +47,9 @@ struct point_stage_data {
 static GLboolean
 run_point_stage(GLcontext *ctx, struct tnl_pipeline_stage *stage)
 {
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
    if (ctx->Point._Attenuated && !ctx->VertexProgram._Enabled) {
       struct point_stage_data *store = POINT_STAGE_DATA(stage);
       struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;

diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 297b731b1dd5f865aa5f893684ee9a58073f6e6f..3908997d71cedda802fa7d2891cbce3506758b03 100644 (file)
--- 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;

diff --git a/src/mesa/tnl/t_vb_texgen.c b/src/mesa/tnl/t_vb_texgen.c
index 1af8e2ba4845fd9ccd64260ea73d1c3369e1a40c..058e7b10b265e4f79a5e705208e343012fe6db24 100644 (file)
--- a/src/mesa/tnl/t_vb_texgen.c
+++ b/src/mesa/tnl/t_vb_texgen.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"),
@@ -488,6 +488,9 @@ static GLboolean run_texgen_stage( GLcontext *ctx,
    struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);
    GLuint i;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
    if (!ctx->Texture._TexGenEnabled || ctx->VertexProgram._Enabled) 
       return GL_TRUE;
 
@@ -513,6 +516,9 @@ static void validate_texgen_stage( GLcontext *ctx,
    struct texgen_stage_data *store = TEXGEN_STAGE_DATA(stage);
    GLuint i;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return;
+
    if (!ctx->Texture._TexGenEnabled || ctx->VertexProgram._Enabled) 
       return;
 

diff --git a/src/mesa/tnl/t_vb_texmat.c b/src/mesa/tnl/t_vb_texmat.c
index 23475303853a07599889af3bac3a99a0ad8e08c1..701f27bd8a53b468b51c70c0811f858c58f45bd6 100644 (file)
--- a/src/mesa/tnl/t_vb_texmat.c
+++ b/src/mesa/tnl/t_vb_texmat.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"),
@@ -61,6 +61,9 @@ static GLboolean run_texmat_stage( GLcontext *ctx,
    struct vertex_buffer *VB = &TNL_CONTEXT(ctx)->vb;
    GLuint i;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
    if (!ctx->Texture._TexMatEnabled || ctx->VertexProgram._Enabled) 
       return GL_TRUE;
 

diff --git a/src/mesa/tnl/t_vb_vertex.c b/src/mesa/tnl/t_vb_vertex.c
index b3defaad05ebaa9d19b26a16b9a9b012e4f22157..f0694f9a69f9913715227cd82e8ed5ce96a891ca 100644 (file)
--- a/src/mesa/tnl/t_vb_vertex.c
+++ b/src/mesa/tnl/t_vb_vertex.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"),
@@ -126,6 +126,9 @@ static GLboolean run_vertex_stage( GLcontext *ctx,
    TNLcontext *tnl = TNL_CONTEXT(ctx);
    struct vertex_buffer *VB = &tnl->vb;
 
+   if (ctx->ShaderObjects.CurrentProgram != NULL)
+      return GL_TRUE;
+
    if (ctx->VertexProgram._Enabled) 
       return GL_TRUE;