4 files changed, 10 insertions, 2 deletions
diff --git a/src/gallium/drivers/freedreno/freedreno_compiler.c b/src/gallium/drivers/freedreno/freedreno_compiler.c
index a26f8cf562c..b9cac8f1228 100644
--- a/src/gallium/drivers/freedreno/freedreno_compiler.c
+++ b/src/gallium/drivers/freedreno/freedreno_compiler.c
@@ -810,6 +810,7 @@ translate_tex(struct fd_compile_context *ctx,
 
 	instr = ir2_instr_create(next_exec_cf(ctx), IR2_FETCH);
 	instr->fetch.opc = TEX_FETCH;
+	instr->fetch.is_cube = (inst->Texture.Texture == TGSI_TEXTURE_3D);
 	assert(inst->Texture.NumOffsets <= 1); // TODO what to do in other cases?
 
 	/* save off the tex fetch to be patched later with correct const_idx: */
@@ -820,6 +821,10 @@ translate_tex(struct fd_compile_context *ctx,
 	add_dst_reg(ctx, instr, using_temp ? &tmp_dst : &inst->Dst[0].Register);
 	reg = add_src_reg(ctx, instr, coord);
 
+	/* blob compiler always sets 3rd component to same as 1st for 2d: */
+	if (inst->Texture.Texture == TGSI_TEXTURE_2D)
+		reg->swizzle[2] = reg->swizzle[0];
+
 	/* dst register needs to be marked for sync: */
 	ctx->need_sync |= 1 << instr->regs[0]->num;
 
diff --git a/src/gallium/drivers/freedreno/instr-a2xx.h b/src/gallium/drivers/freedreno/instr-a2xx.h
index cecc7a98b8a..e1e897ee561 100644
--- a/src/gallium/drivers/freedreno/instr-a2xx.h
+++ b/src/gallium/drivers/freedreno/instr-a2xx.h
@@ -327,7 +327,7 @@ typedef struct PACKED {
 	instr_tex_filter_t  vol_mag_filter           : 2;
 	instr_tex_filter_t  vol_min_filter           : 2;
 	uint8_t             use_comp_lod             : 1;
-	uint8_t             use_reg_lod              : 2;
+	uint8_t             use_reg_lod              : 2;  /* 0 for cube, 1 for 2d */
 	uint8_t             pred_select              : 1;
 	/* dword2: */
 	uint8_t             use_reg_gradients        : 1;
diff --git a/src/gallium/drivers/freedreno/ir-a2xx.c b/src/gallium/drivers/freedreno/ir-a2xx.c
index 2448a782ddb..18afba8a5a3 100644
--- a/src/gallium/drivers/freedreno/ir-a2xx.c
+++ b/src/gallium/drivers/freedreno/ir-a2xx.c
@@ -339,6 +339,7 @@ static int instr_emit_fetch(struct ir2_instruction *instr,
 		tex->vol_mag_filter = TEX_FILTER_USE_FETCH_CONST;
 		tex->vol_min_filter = TEX_FILTER_USE_FETCH_CONST;
 		tex->use_comp_lod = 1;
+		tex->use_reg_lod = !instr->fetch.is_cube;
 		tex->sample_location = SAMPLE_CENTER;
 
 		if (instr->pred != IR2_PRED_NONE) {
diff --git a/src/gallium/drivers/freedreno/ir-a2xx.h b/src/gallium/drivers/freedreno/ir-a2xx.h
index e2c7eff504e..822e5ec4c23 100644
--- a/src/gallium/drivers/freedreno/ir-a2xx.h
+++ b/src/gallium/drivers/freedreno/ir-a2xx.h
@@ -72,7 +72,9 @@ struct ir2_instruction {
 		struct {
 			instr_fetch_opc_t opc;
 			unsigned const_idx;
-			/* maybe vertex fetch specific: */
+			/* texture fetch specific: */
+			bool is_cube : 1;
+			/* vertex fetch specific: */
 			unsigned const_idx_sel;
 			enum a2xx_sq_surfaceformat fmt;
 			bool is_signed : 1;