diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-11-10 15:53:51 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-11-10 15:53:51 +1100 |
| commit | 32e6be6362e44609d36c2fb20a4c858f57c908fb (patch) | |
| tree | 4ed99e93ef5f4a8bb51653917c911e04e42f5235 /src/mesa/main/ffvertex_prog.c | |
| parent | 92674bc8889e10e580c630cf85c106fa6eb34d7b (diff) | |
| parent | 399da3a337932c6074a69ac73e711138271308eb (diff) | |
Merge remote branch 'origin/gallium-0.2' into gallium-0.2
Diffstat (limited to 'src/mesa/main/ffvertex_prog.c')
| -rw-r--r-- | src/mesa/main/ffvertex_prog.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/ffvertex_prog.c b/src/mesa/main/ffvertex_prog.c index da2640dd8f..64a4788aa4 100644 --- a/src/mesa/main/ffvertex_prog.c +++ b/src/mesa/main/ffvertex_prog.c @@ -1306,14 +1306,13 @@ static void build_lighting( struct tnl_program *p ) } else if (!p->state->material_shininess_is_zero) { emit_op1(p, OPCODE_LIT, lit, 0, dots); - emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0); + emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0); } else { emit_degenerate_lit(p, lit, dots); - emit_op2(p, OPCODE_ADD, _col0, 0, ambient, _col0); + emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0); } - emit_op2(p, OPCODE_ADD, _bfc0, 0, ambient, _bfc0); emit_op3(p, OPCODE_MAD, res0, mask0, swizzle1(lit,Y), diffuse, _bfc0); emit_op3(p, OPCODE_MAD, res1, mask1, swizzle1(lit,Z), specular, _bfc1); |