summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/shader/prog_execute.c2
-rw-r--r--src/mesa/shader/prog_execute.h2
-rw-r--r--src/mesa/swrast/s_fragprog.c3
-rw-r--r--src/mesa/tnl/t_vb_program.c2
4 files changed, 4 insertions, 5 deletions
diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index 063d572428..0982e3e322 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -641,7 +641,7 @@ init_machine_deriv(GLcontext * ctx,
GLboolean
_mesa_execute_program(GLcontext * ctx,
const struct gl_program *program, GLuint maxInst,
- struct gl_program_machine *machine, GLuint element)
+ struct gl_program_machine *machine)
{
const GLuint MAX_EXEC = 10000;
GLint pc, total = 0;
diff --git a/src/mesa/shader/prog_execute.h b/src/mesa/shader/prog_execute.h
index 1eb9e73d01..feda65fe03 100644
--- a/src/mesa/shader/prog_execute.h
+++ b/src/mesa/shader/prog_execute.h
@@ -75,7 +75,7 @@ _mesa_get_program_register(GLcontext *ctx, enum register_file file,
extern GLboolean
_mesa_execute_program(GLcontext *ctx,
const struct gl_program *program, GLuint maxInst,
- struct gl_program_machine *machine, GLuint element);
+ struct gl_program_machine *machine);
#endif /* PROG_EXECUTE_H */
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 4482006ba6..f88714d5c7 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -148,8 +148,7 @@ run_program(GLcontext *ctx, SWspan *span, GLuint start, GLuint end)
init_machine(ctx, &machine, program, span, i);
if (_mesa_execute_program(ctx, &program->Base,
- program->Base.NumInstructions,
- &machine, i)) {
+ program->Base.NumInstructions, &machine)) {
/* Store result color */
COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0][i],
machine.Outputs[FRAG_RESULT_COLR]);
diff --git a/src/mesa/tnl/t_vb_program.c b/src/mesa/tnl/t_vb_program.c
index 3fe796ac56..05b1a4aaab 100644
--- a/src/mesa/tnl/t_vb_program.c
+++ b/src/mesa/tnl/t_vb_program.c
@@ -258,7 +258,7 @@ run_vp( GLcontext *ctx, struct tnl_pipeline_stage *stage )
/* execute the program */
_mesa_execute_program(ctx, &program->Base, program->Base.NumInstructions,
- &machine, 0);
+ &machine);
/* Fixup fog an point size results if needed */
if (ctx->Fog.Enabled &&