From: Alejandro Piñeiro Date: Fri, 26 Jun 2020 13:32:31 +0000 (+0200) Subject: v3d/tex: handle correctly coordinates for cube/cubearrays images X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8946bd705ce8cfaf0d2d571fefcf67161f9c5d5;p=mesa.git v3d/tex: handle correctly coordinates for cube/cubearrays images When fetching for cube maps, we need to interpret them as 2d texture arrays, being the third coordinate the index for the face. Fixes Vulkan CTS tests like the following using v3dv: dEQP-VK.binding_model.shader_access.primary_cmd_buf.storage_image.fragment.single_descriptor.cube_base_mip dEQP-VK.binding_model.shader_access.primary_cmd_buf.storage_image.compute.multiple_descriptor_sets.multiple_contiguous_descriptors.cube_array_base_mip Reviewed-by: Iago Toral Quiroga Part-of: --- diff --git a/src/broadcom/compiler/v3d40_tex.c b/src/broadcom/compiler/v3d40_tex.c index 7af14baf127..90e64f638fc 100644 --- a/src/broadcom/compiler/v3d40_tex.c +++ b/src/broadcom/compiler/v3d40_tex.c @@ -363,11 +363,11 @@ v3d40_vir_emit_image_load_store(struct v3d_compile *c, break; case GLSL_SAMPLER_DIM_2D: case GLSL_SAMPLER_DIM_RECT: + case GLSL_SAMPLER_DIM_CUBE: vir_TMU_WRITE(c, V3D_QPU_WADDR_TMUT, ntq_get_src(c, instr->src[1], 1), &tmu_writes); break; case GLSL_SAMPLER_DIM_3D: - case GLSL_SAMPLER_DIM_CUBE: vir_TMU_WRITE(c, V3D_QPU_WADDR_TMUT, ntq_get_src(c, instr->src[1], 1), &tmu_writes); vir_TMU_WRITE(c, V3D_QPU_WADDR_TMUR, @@ -377,7 +377,11 @@ v3d40_vir_emit_image_load_store(struct v3d_compile *c, unreachable("bad image sampler dim"); } - if (nir_intrinsic_image_array(instr)) { + /* In order to fetch on a cube map, we need to interpret it as + * 2D arrays, where the third coord would be the face index. + */ + if (nir_intrinsic_image_dim(instr) == GLSL_SAMPLER_DIM_CUBE || + nir_intrinsic_image_array(instr)) { vir_TMU_WRITE(c, V3D_QPU_WADDR_TMUI, ntq_get_src(c, instr->src[1], is_1d ? 1 : 2), &tmu_writes);