summaryrefslogtreecommitdiff
path: root/src/mesa/tnl
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2012-10-09 15:34:49 -0700
committerEric Anholt <eric@anholt.net>2012-10-15 11:53:23 -0700
commit6ab9c0476992752ff3ac0c80b6952075a4679aeb (patch)
treee9b92ccff25c862d9303d5e7a2864d3ca8bb2e18 /src/mesa/tnl
parentbcfd51f8c45be2ee99f302ed3310c34998b19ff6 (diff)
mesa: Remove support for NV_vertex_program's tracked matrices.
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/tnl')
-rw-r--r--src/mesa/tnl/t_vb_program.c9
-rw-r--r--src/mesa/tnl/tnl.h3
2 files changed, 2 insertions, 10 deletions
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index f2e76115ec6..61ccece001d 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -321,13 +321,8 @@ run_vp( struct gl_context *ctx, struct tnl_pipeline_stage *stage )
if (!program)
return GL_TRUE;
- if (program->IsNVProgram) {
- _mesa_load_tracked_matrices(ctx);
- }
- else {
- /* ARB program or vertex shader */
- _mesa_load_state_parameters(ctx, program->Base.Parameters);
- }
+ /* ARB program or vertex shader */
+ _mesa_load_state_parameters(ctx, program->Base.Parameters);
/* make list of outputs to save some time below */
numOutputs = 0;
diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h
index f6b70e3236f..95832288702 100644
--- a/src/mesa/tnl/tnl.h
+++ b/src/mesa/tnl/tnl.h
@@ -95,9 +95,6 @@ _tnl_vbo_draw_prims( struct gl_context *ctx,
struct gl_transform_feedback_object *tfb_vertcount );
extern void
-_mesa_load_tracked_matrices(struct gl_context *ctx);
-
-extern void
_tnl_RasterPos(struct gl_context *ctx, const GLfloat vObj[4]);
extern void