diff options
| author | Axel Davy <axel.davy@ens.fr> | 2016-09-25 19:39:29 +0200 |
|---|---|---|
| committer | Axel Davy <axel.davy@ens.fr> | 2016-10-10 23:43:50 +0200 |
| commit | c56c7c1fc8feb26eb97b406cb792d474f2c5b03c (patch) | |
| tree | 64357f9525d00a3b088ea6976b7e385cee2556f1 /src/gallium/state_trackers/nine | |
| parent | c5bce80f505e0fba4f646649945454ba07e94a83 (diff) | |
| download | external_mesa3d-c56c7c1fc8feb26eb97b406cb792d474f2c5b03c.zip external_mesa3d-c56c7c1fc8feb26eb97b406cb792d474f2c5b03c.tar.gz external_mesa3d-c56c7c1fc8feb26eb97b406cb792d474f2c5b03c.tar.bz2 | |
st/nine: Do always accumulate diffuse
According to spec.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Diffstat (limited to 'src/gallium/state_trackers/nine')
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_ff.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/nine/nine_ff.c b/src/gallium/state_trackers/nine/nine_ff.c index 924cb4c..374e92f 100644 --- a/src/gallium/state_trackers/nine/nine_ff.c +++ b/src/gallium/state_trackers/nine/nine_ff.c @@ -888,16 +888,15 @@ nine_ff_build_vs(struct NineDevice9 *device, struct vs_build_ctx *vs) ureg_normalize3(ureg, rMid, ureg_src(rMid)); ureg_DP3(ureg, ureg_saturate(tmp_y), vs->aNrm, ureg_src(rMid)); ureg_POW(ureg, tmp_y, _Y(tmp), mtlP); - - ureg_MUL(ureg, tmp_x, _W(rAtt), _X(tmp)); /* dp3(normal,hitDir) * att */ ureg_MUL(ureg, tmp_y, _W(rAtt), _Y(tmp)); /* power factor * att */ - ureg_MAD(ureg, rD, cLColD, _X(tmp), ureg_src(rD)); /* accumulate diffuse */ ureg_MAD(ureg, rS, cLColS, _Y(tmp), ureg_src(rS)); /* accumulate specular */ } ureg_fixup_label(ureg, label[l-1], ureg_get_instruction_number(ureg)); ureg_ENDIF(ureg); ureg_MAD(ureg, rA, cLColA, _W(rAtt), ureg_src(rA)); /* accumulate ambient */ + ureg_MUL(ureg, tmp_x, _W(rAtt), _X(tmp)); /* dp3(normal,hitDir) * att */ + ureg_MAD(ureg, rD, cLColD, _X(tmp), ureg_src(rD)); /* accumulate diffuse */ /* break if this was the last light */ ureg_IF(ureg, cLLast, &label[l++]); |