summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Davy <[email protected]>2014-12-26 09:22:26 +0100
committerEmil Velikov <[email protected]>2015-01-22 22:16:20 +0000
commit53dc992f204678acb9af9d1b11c1be371400930c (patch)
tree7c2528ac45182d0847bdb177f3ee9f93f18174df
parent9fb58a74a04df02904317acfbd383f53305eed67 (diff)
st/nine: Correctly declare NineTranslateInstruction_Mkxn inputs
Let's say we have c1 and c2 declared in the shader and c0 given by the app Then here we would have read c0, c1 and c2 given by the app, instead of the correct c0, c1, c2. This correction fixes several issues in some games. Reviewed-by: Ilia Mirkin <[email protected]> Signed-off-by: Axel Davy <[email protected]> Cc: "10.4" <[email protected]>
-rw-r--r--src/gallium/state_trackers/nine/nine_shader.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/state_trackers/nine/nine_shader.c b/src/gallium/state_trackers/nine/nine_shader.c
index 735f56b29f1..3a3e6bd4392 100644
--- a/src/gallium/state_trackers/nine/nine_shader.c
+++ b/src/gallium/state_trackers/nine/nine_shader.c
@@ -1158,16 +1158,19 @@ NineTranslateInstruction_Mkxn(struct shader_translator *tx, const unsigned k, co
struct ureg_program *ureg = tx->ureg;
struct ureg_dst dst;
struct ureg_src src[2];
+ struct sm1_src_param *src_mat = &tx->insn.src[1];
unsigned i;
dst = tx_dst_param(tx, &tx->insn.dst[0]);
src[0] = tx_src_param(tx, &tx->insn.src[0]);
- src[1] = tx_src_param(tx, &tx->insn.src[1]);
- for (i = 0; i < n; i++, src[1].Index++)
+ for (i = 0; i < n; i++)
{
const unsigned m = (1 << i);
+ src[1] = tx_src_param(tx, src_mat);
+ src_mat->idx++;
+
if (!(dst.WriteMask & m))
continue;