diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/tnl/t_vb_program.c | 14 | ||||
| -rw-r--r-- | src/mesa/tnl/tnl.h | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c index 422aae69e2d..72a65f89f12 100644 --- a/src/mesa/tnl/t_vb_program.c +++ b/src/mesa/tnl/t_vb_program.c @@ -38,6 +38,7 @@ #include "prog_statevars.h" #include "prog_execute.h" +#include "tnl.h" #include "t_context.h" #include "t_pipeline.h" @@ -121,11 +122,12 @@ load_transpose_matrix(GLfloat registers[][4], GLuint pos, /** - * Load program parameter registers with tracked matrices (if NV program). - * This only needs to be done per glBegin/glEnd, not per-vertex. + * Load current vertex program's parameter registers with tracked + * matrices (if NV program). This only needs to be done per + * glBegin/glEnd, not per-vertex. */ -static void -load_program_parameters(GLcontext *ctx) +void +_mesa_load_tracked_matrices(GLcontext *ctx) { GLuint i; @@ -160,7 +162,7 @@ load_program_parameters(GLcontext *ctx) continue; } - /* load the matrix values into sequential registers */ + /* load the matrix values into sequential registers */ if (ctx->VertexProgram.TrackMatrixTransform[i] == GL_IDENTITY_NV) { load_matrix(ctx->VertexProgram.Parameters, i*4, mat->m); } @@ -206,7 +208,7 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage ) #endif if (ctx->VertexProgram.Current->IsNVProgram) { - load_program_parameters(ctx); + _mesa_load_tracked_matrices(ctx); } else { _mesa_load_state_parameters(ctx, program->Base.Parameters); diff --git a/src/mesa/tnl/tnl.h b/src/mesa/tnl/tnl.h index 17cb30adc76..20bed5546de 100644 --- a/src/mesa/tnl/tnl.h +++ b/src/mesa/tnl/tnl.h @@ -82,4 +82,7 @@ _tnl_draw_prims( GLcontext *ctx, GLuint min_index, GLuint max_index); +extern void +_mesa_load_tracked_matrices(GLcontext *ctx); + #endif |