diff --git a/.pick_status.json b/.pick_status.json index 03a176ce0a9..d5ead1785d0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -688,7 +688,7 @@ "description": "r600: Fix duplicated subexpression in r600_asm.c", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "4422ce1b04c117f61394a6834cd7933f06ce4e1f" }, 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; }