From: Eric Anholt <eric@anholt.net>
Date: Mon, 15 Feb 2016 22:43:38 +0000 (-0800)
Subject: vc4: Don't treat conditional MOVs as raw MOV.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=655fa0f46531a15b6fb0e31486e305e518100c66;p=mesa.git

vc4: Don't treat conditional MOVs as raw MOV.

The two consumers want to know that the destination will be exactly the
source, which is not true if we might not set the destination.

Signed-off-by: Eric Anholt <eric@anholt.net>
---

diff --git a/src/gallium/drivers/vc4/vc4_qir.c b/src/gallium/drivers/vc4/vc4_qir.c
index efbb69b71a7..f9eb0e151c5 100644
--- a/src/gallium/drivers/vc4/vc4_qir.c
+++ b/src/gallium/drivers/vc4/vc4_qir.c
@@ -193,6 +193,7 @@ qir_is_raw_mov(struct qinst *inst)
         return ((inst->op == QOP_MOV ||
                  inst->op == QOP_FMOV ||
                  inst->op == QOP_MMOV) &&
+                inst->cond == QPU_COND_ALWAYS &&
                 !inst->dst.pack &&
                 !inst->src[0].pack);
 }