diff options
| author | Axel Davy <axel.davy@ens.fr> | 2014-12-25 16:50:09 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2015-01-22 23:43:28 +0000 |
| commit | 4b65be88608405fcc715065b4dc0e503652c5089 (patch) | |
| tree | ffae97703adc1e6019a4352a54f8277f1bdcd5f5 | |
| parent | 9ea8e7f0df06ec7d58c172e612db33b73a9df228 (diff) | |
st/nine: Fix some fixed function pipeline operation
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Cc: "10.4" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 6378d749379f7fedd668148e09dd032b8ce9a212)
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_ff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/nine/nine_ff.c b/src/gallium/state_trackers/nine/nine_ff.c index 4ffc431a8c..3f565028d2 100644 --- a/src/gallium/state_trackers/nine/nine_ff.c +++ b/src/gallium/state_trackers/nine/nine_ff.c @@ -1151,10 +1151,10 @@ ps_do_ts_op(struct ps_build_ctx *ps, unsigned top, struct ureg_dst dst, struct u ureg_MUL(ureg, ureg_saturate(dst), ureg_src(tmp), ureg_imm4f(ureg,4.0,4.0,4.0,4.0)); break; case D3DTOP_MULTIPLYADD: - ureg_MAD(ureg, dst, arg[2], arg[0], arg[1]); + ureg_MAD(ureg, dst, arg[1], arg[2], arg[0]); break; case D3DTOP_LERP: - ureg_LRP(ureg, dst, arg[1], arg[2], arg[0]); + ureg_LRP(ureg, dst, arg[0], arg[1], arg[2]); break; case D3DTOP_DISABLE: /* no-op ? */ @@ -1278,6 +1278,8 @@ nine_ff_build_ps(struct NineDevice9 *device, struct nine_ff_ps_key *key) (key->ts[0].resultarg != 0 /* not current */ || key->ts[0].colorop == D3DTOP_DISABLE || key->ts[0].alphaop == D3DTOP_DISABLE || + key->ts[0].colorop == D3DTOP_BLENDCURRENTALPHA || + key->ts[0].alphaop == D3DTOP_BLENDCURRENTALPHA || key->ts[0].colorarg0 == D3DTA_CURRENT || key->ts[0].colorarg1 == D3DTA_CURRENT || key->ts[0].colorarg2 == D3DTA_CURRENT || |