radeonsi: remove redundant si_shader_info::images_declared

[mesa.git] / src / gallium / drivers / r600 / r600_asm.c

diff --git a/src/gallium/drivers/r600/r600_asm.c b/src/gallium/drivers/r600/r600_asm.c
index 4856abe75c1c14294577792d63376a54478977ed..8f710052c68eb1d6846d14656009431c02fe632c 100644 (file)
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -928,7 +928,7 @@ static int merge_inst_groups(struct r600_bytecode *bc, struct r600_bytecode_alu
        for (i = 0; i < max_slots; ++i) {
                slots[i] = result[i];
                if (result[i]) {
-                       LIST_DEL(&result[i]->list);
+                       list_del(&result[i]->list);
                        result[i]->last = 0;
                        list_addtail(&result[i]->list, &bc->cf_last->alu);
                }
@@ -1450,7 +1450,9 @@ int r600_bytecode_add_tex(struct r600_bytecode *bc, const struct r600_bytecode_t
                bc->cf_last->op == CF_OP_TEX) {
                struct r600_bytecode_tex *ttex;
                LIST_FOR_EACH_ENTRY(ttex, &bc->cf_last->tex, list) {
-                       if (ttex->dst_gpr == ntex->src_gpr) {
+                       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_w < 4)) {
                                bc->force_add_cf = 1;
                                break;
                        }