diff --git a/src/gallium/drivers/r600/evergreen_compute.c b/src/gallium/drivers/r600/evergreen_compute.c
index 6ead7afb97e..9be23646781 100644
--- a/src/gallium/drivers/r600/evergreen_compute.c
+++ b/src/gallium/drivers/r600/evergreen_compute.c
@@ -321,7 +321,7 @@ static void compute_emit_cs(struct r600_context *rctx,
 	}
 
 	bool need_buf_const = current->shader.uses_tex_buffers ||
-		current->shader.has_txq_cube_array_z_comp;
+		current->shader.has_resinfo_via_uniform;
 
 	if (info->indirect) {
 		struct r600_resource *indirect_resource = r600_as_resource(info->indirect);
diff --git a/src/gallium/drivers/r600/r600_dump.c b/src/gallium/drivers/r600/r600_dump.c
index 11548eecf0a..a17ba2366f6 100644
--- a/src/gallium/drivers/r600/r600_dump.c
+++ b/src/gallium/drivers/r600/r600_dump.c
@@ -85,7 +85,7 @@ void print_shader_info(FILE *f , int id, struct r600_shader *shader)
    PRINT_UINT_MEMBER(vs_out_layer);
    PRINT_UINT_MEMBER(vs_out_viewport);
    PRINT_UINT_MEMBER(vs_out_edgeflag);
-   PRINT_UINT_MEMBER(has_txq_cube_array_z_comp);
+   PRINT_UINT_MEMBER(has_resinfo_via_uniform);
    PRINT_UINT_MEMBER(uses_tex_buffers);
    PRINT_UINT_MEMBER(gs_prim_id_input);
    PRINT_UINT_MEMBER(gs_tri_strip_adj_fix);
diff --git a/src/gallium/drivers/r600/r600_shader_common.h b/src/gallium/drivers/r600/r600_shader_common.h
index 0e2c642f3f8..c8a3a4c61b6 100644
--- a/src/gallium/drivers/r600/r600_shader_common.h
+++ b/src/gallium/drivers/r600/r600_shader_common.h
@@ -85,7 +85,7 @@ struct r600_shader {
 	bool			vs_out_layer;
 	bool			vs_out_viewport;
 	bool			vs_out_edgeflag;
-	bool			has_txq_cube_array_z_comp;
+	bool			has_resinfo_via_uniform;
 	bool			uses_tex_buffers;
 	bool                 gs_prim_id_input;
 	bool                 gs_tri_strip_adj_fix;
diff --git a/src/gallium/drivers/r600/r600_state_common.c b/src/gallium/drivers/r600/r600_state_common.c
index 2ce6589d712..ad3cbcf07db 100644
--- a/src/gallium/drivers/r600/r600_state_common.c
+++ b/src/gallium/drivers/r600/r600_state_common.c
@@ -1992,21 +1992,21 @@ static bool r600_update_derived_state(struct r600_context *rctx)
 	/* on R600 we stuff masks + txq info into one constant buffer */
 	/* on evergreen we only need a txq info one */
 	if (rctx->ps_shader) {
-		need_buf_const = rctx->ps_shader->current->shader.uses_tex_buffers || rctx->ps_shader->current->shader.has_txq_cube_array_z_comp;
+		need_buf_const = rctx->ps_shader->current->shader.uses_tex_buffers || rctx->ps_shader->current->shader.has_resinfo_via_uniform;
 		if (need_buf_const) {
 			rctx->setup_buffer_constants(rctx, MESA_SHADER_FRAGMENT);
 		}
 	}
 
 	if (rctx->vs_shader) {
-		need_buf_const = rctx->vs_shader->current->shader.uses_tex_buffers || rctx->vs_shader->current->shader.has_txq_cube_array_z_comp;
+		need_buf_const = rctx->vs_shader->current->shader.uses_tex_buffers || rctx->vs_shader->current->shader.has_resinfo_via_uniform;
 		if (need_buf_const) {
 			rctx->setup_buffer_constants(rctx, MESA_SHADER_VERTEX);
 		}
 	}
 
 	if (rctx->gs_shader) {
-		need_buf_const = rctx->gs_shader->current->shader.uses_tex_buffers || rctx->gs_shader->current->shader.has_txq_cube_array_z_comp;
+		need_buf_const = rctx->gs_shader->current->shader.uses_tex_buffers || rctx->gs_shader->current->shader.has_resinfo_via_uniform;
 		if (need_buf_const) {
 			rctx->setup_buffer_constants(rctx, MESA_SHADER_GEOMETRY);
 		}
@@ -2015,13 +2015,13 @@ static bool r600_update_derived_state(struct r600_context *rctx)
 	if (rctx->tes_shader) {
 		assert(rctx->b.gfx_level >= EVERGREEN);
 		need_buf_const = rctx->tes_shader->current->shader.uses_tex_buffers ||
-				 rctx->tes_shader->current->shader.has_txq_cube_array_z_comp;
+				 rctx->tes_shader->current->shader.has_resinfo_via_uniform;
 		if (need_buf_const) {
 			rctx->setup_buffer_constants(rctx, MESA_SHADER_TESS_EVAL);
 		}
 		if (rctx->tcs_shader) {
 			need_buf_const = rctx->tcs_shader->current->shader.uses_tex_buffers ||
-					 rctx->tcs_shader->current->shader.has_txq_cube_array_z_comp;
+					 rctx->tcs_shader->current->shader.has_resinfo_via_uniform;
 			if (need_buf_const) {
 				rctx->setup_buffer_constants(rctx, MESA_SHADER_TESS_CTRL);
 			}
diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_mem.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_mem.cpp
index 99f945569d7..863d562c7dc 100644
--- a/src/gallium/drivers/r600/sfn/sfn_instr_mem.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_instr_mem.cpp
@@ -974,7 +974,7 @@ RatInstr::emit_image_size(nir_intrinsic_instr *intrin, Shader& shader)
                                               res_id,
                                               dyn_offset));
 
-         shader.set_flag(Shader::sh_txs_cube_array_comp);
+         shader.set_flag(Shader::sh_resinfo_via_uniform);
 
          if (const_offset) {
             unsigned lookup_resid = (res_id - R600_IMAGE_REAL_RESOURCE_OFFSET) +
diff --git a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
index 38d26a40f6b..cd0abd98014 100644
--- a/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_instr_tex.cpp
@@ -691,7 +691,7 @@ TexInstr::emit_tex_txs(nir_tex_instr *tex,
 
          auto alu = new AluInstr(op1_mov, dest[2], src_loc, AluInstr::write);
          shader.emit_instruction(alu);
-         shader.set_flag(Shader::sh_txs_cube_array_comp);
+         shader.set_flag(Shader::sh_resinfo_via_uniform);
       }
    }
 
diff --git a/src/gallium/drivers/r600/sfn/sfn_shader.cpp b/src/gallium/drivers/r600/sfn/sfn_shader.cpp
index a7d169add9c..4b7878de462 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader.cpp
+++ b/src/gallium/drivers/r600/sfn/sfn_shader.cpp
@@ -1822,7 +1822,7 @@ Shader::get_shader_info(r600_shader *sh_info)
    sh_info->uses_images = m_flags.test(sh_uses_images);
    sh_info->uses_atomics = m_flags.test(sh_uses_atomics);
    sh_info->disable_sb = m_flags.test(sh_disble_sb);
-   sh_info->has_txq_cube_array_z_comp = m_flags.test(sh_txs_cube_array_comp);
+   sh_info->has_resinfo_via_uniform = m_flags.test(sh_resinfo_via_uniform);
    sh_info->indirect_files = m_indirect_files;
    do_get_shader_info(sh_info);
 }
diff --git a/src/gallium/drivers/r600/sfn/sfn_shader.h b/src/gallium/drivers/r600/sfn/sfn_shader.h
index 3718821ae59..6ae473238fa 100644
--- a/src/gallium/drivers/r600/sfn/sfn_shader.h
+++ b/src/gallium/drivers/r600/sfn/sfn_shader.h
@@ -219,7 +219,7 @@ public:
       sh_uses_images,
       sh_uses_tex_buffer,
       sh_writes_memory,
-      sh_txs_cube_array_comp,
+      sh_resinfo_via_uniform,
       sh_indirect_atomic,
       sh_mem_barrier,
       sh_legacy_math_rules,