Mesa (main): r600: don't put INTERP_X and INTERP_Z into one instruction group

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 9bf5033941a9ab319b6d13ad86fd3c591bd81a54
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9bf5033941a9ab319b6d13ad86fd3c591bd81a54

Author: Gert Wollny <gert.wollny at collabora.com>
Date:   Mon May 10 07:50:08 2021 +0200

r600: don't put INTERP_X and INTERP_Z into one instruction group

Apparently this is not allowed and results in interpolation errors.

Signed-off-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10608>

---

 src/gallium/drivers/r600/r600_asm.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 6a9690f699c..01c47ff2d2b 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -762,6 +762,8 @@ static int merge_inst_groups(struct r600_bytecode *bc, struct r600_bytecode_alu
 	struct r600_bytecode_alu *prev[5];
 	struct r600_bytecode_alu *result[5] = { NULL };
 
+        uint8_t interp_xz = 0;
+
 	uint32_t literal[4], prev_literal[4];
 	unsigned nliteral = 0, prev_nliteral = 0;
 
@@ -780,13 +782,24 @@ static int merge_inst_groups(struct r600_bytecode *bc, struct r600_bytecode_alu
 			      return 0;
 		      if (is_alu_once_inst(prev[i]))
 			      return 0;
+
+                      if (prev[i]->op == ALU_OP2_INTERP_X)
+                         interp_xz |= 1;
+                      if (prev[i]->op == ALU_OP2_INTERP_Z)
+                         interp_xz |= 2;
 		}
 		if (slots[i]) {
 			if (slots[i]->pred_sel)
 				return 0;
 			if (is_alu_once_inst(slots[i]))
 				return 0;
+                        if (slots[i]->op == ALU_OP2_INTERP_X)
+                           interp_xz |= 1;
+                        if (slots[i]->op == ALU_OP2_INTERP_Z)
+                           interp_xz |= 2;
 		}
+                if (interp_xz == 3)
+                   return 0;
 	}
 
 	for (i = 0; i < max_slots; ++i) {