Mesa (master): freedreno/ir3: don't remove unused input components

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: cca1e9606c1fa05dafb994d2d1d92a9b2a35c5c2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cca1e9606c1fa05dafb994d2d1d92a9b2a35c5c2

Author: Rob Clark <robdclark at gmail.com>
Date:   Thu Dec 13 13:50:50 2018 -0500

freedreno/ir3: don't remove unused input components

Fixes: 0d240c22141 freedreno/ir3: don't fetch unused tex components
Signed-off-by: Rob Clark <robdclark at gmail.com>

---

 src/freedreno/ir3/ir3_depth.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/ir3/ir3_depth.c b/src/freedreno/ir3/ir3_depth.c
index 4e377fa4ee..e0500b4316 100644
--- a/src/freedreno/ir3/ir3_depth.c
+++ b/src/freedreno/ir3/ir3_depth.c
@@ -176,7 +176,13 @@ remove_unused_by_block(struct ir3_block *block)
 		if (instr->flags & IR3_INSTR_UNUSED) {
 			if (instr->opc == OPC_META_FO) {
 				struct ir3_instruction *src = ssa(instr->regs[1]);
-				if (src->regs[0]->wrmask > 1) {
+				/* leave inputs alone.. we can't optimize out components of
+				 * an input, since the hw is still going to be writing all
+				 * of the components, and we could end up in a situation
+				 * where multiple inputs overlap.
+				 */
+				if ((src->opc != OPC_META_INPUT) &&
+						(src->regs[0]->wrmask > 1)) {
 					src->regs[0]->wrmask &= ~(1 << instr->fo.off);
 
 					/* prune no-longer needed right-neighbors.  We could