From: Gert Wollny <gert.wollny@collabora.com>
Date: Sat, 23 May 2020 15:43:50 +0000 (+0200)
Subject: r600: Fix duplicated subexpression in r600_asm.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=901793d558e6fcba5438fc0738226833f6147c8b;p=mesa.git

r600: Fix duplicated subexpression in r600_asm.c

Fixes: 4422ce1b04c117f61394a6834cd7933f06ce4e1f
    r600: force new CF with TEX only if any texture value is written

Closes #3012

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

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index a604e74bb7e..8f710052c68 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -1452,7 +1452,7 @@ int r600_bytecode_add_tex(struct r600_bytecode *bc, const struct r600_bytecode_t
 		LIST_FOR_EACH_ENTRY(ttex, &bc->cf_last->tex, list) {
 			if (ttex->dst_gpr == ntex->src_gpr &&
                             (ttex->dst_sel_x < 4 || ttex->dst_sel_y < 4 ||
-                             ttex->dst_sel_z < 4 || ttex->dst_sel_z < 4)) {
+                             ttex->dst_sel_z < 4 || ttex->dst_sel_w < 4)) {
 				bc->force_add_cf = 1;
 				break;
 			}