summaryrefslogtreecommitdiff
path: root/src/mesa/swrast/s_fragprog.c
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-02-26 13:11:20 -0700
committerBrian <brian@yutani.localnet.net>2007-02-26 13:11:20 -0700
commit25ea5ea27e7fa4bd7151723d7549a0c33ac1ceda (patch)
tree845f42be66305613b31728728109939c7b51bba7 /src/mesa/swrast/s_fragprog.c
parent32fbbf38b4358acd46569fd3c2b21fbc21e417a8 (diff)
parent3c1c999226859216b8af35c4806413b4488f21b4 (diff)
Merge branch 'glsl-compiler-1' of git+ssh://brianp@git.freedesktop.org/git/mesa/mesa into glsl-compiler-1
Diffstat (limited to 'src/mesa/swrast/s_fragprog.c')
-rw-r--r--src/mesa/swrast/s_fragprog.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/swrast/s_fragprog.c b/src/mesa/swrast/s_fragprog.c
index 4482006ba6..4e1c829773 100644
--- a/src/mesa/swrast/s_fragprog.c
+++ b/src/mesa/swrast/s_fragprog.c
@@ -147,9 +147,7 @@ run_program(GLcontext *ctx, SWspan *span, GLuint start, GLuint end)
if (span->array->mask[i]) {
init_machine(ctx, &machine, program, span, i);
- if (_mesa_execute_program(ctx, &program->Base,
- program->Base.NumInstructions,
- &machine, i)) {
+ if (_mesa_execute_program(ctx, &program->Base, &machine)) {
/* Store result color */
COPY_4V(span->array->attribs[FRAG_ATTRIB_COL0][i],
machine.Outputs[FRAG_RESULT_COLR]);