diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-07 10:17:31 -0700 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2008-11-07 10:17:31 -0700 |
| commit | 3059ceb7f8128f00846f261f1927f5ec72d5dd15 (patch) | |
| tree | 54a225dcfe71df372242437aaff922e771fb674c /src/mesa/main/ffvertex_prog.c | |
| parent | 3225bc84932f08a52db7025367ae206a9d2f8fef (diff) | |
| parent | a98a25c25ff1ec3be74cf9c5f027b85a297c3e78 (diff) | |
Merge commit 'origin/master' 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); |