From 2a470ab0d02e3d30dcf5c894086e67011dca34bb Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Tue, 8 Dec 2020 13:35:32 +0100 Subject: [PATCH] v3dv/meta: Use sized types for nir_tex_instr::dest_type Acked-by: Jason Ekstrand Part-of: --- src/broadcom/vulkan/v3dv_meta_copy.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_meta_copy.c b/src/broadcom/vulkan/v3dv_meta_copy.c index 6adfef7db4d..493ad91df02 100644 --- a/src/broadcom/vulkan/v3dv_meta_copy.c +++ b/src/broadcom/vulkan/v3dv_meta_copy.c @@ -3097,7 +3097,7 @@ get_texel_buffer_copy_fs(struct v3dv_device *device, VkFormat format) tex->src[0].src = nir_src_for_ssa(texel_offset); tex->src[1].src_type = nir_tex_src_texture_deref; tex->src[1].src = nir_src_for_ssa(tex_deref); - tex->dest_type = nir_type_uint; + tex->dest_type = nir_type_uint32; tex->is_array = false; tex->coord_components = 1; nir_ssa_dest_init(&tex->instr, &tex->dest, 4, 32, "texel buffer result"); @@ -4309,8 +4309,7 @@ build_nir_tex_op_read(struct nir_builder *b, tex->src[1].src = nir_src_for_ssa(tex_deref); tex->src[2].src_type = nir_tex_src_sampler_deref; tex->src[2].src = nir_src_for_ssa(tex_deref); - tex->dest_type = - nir_alu_type_get_base_type(nir_get_nir_type_for_glsl_base_type(tex_type)); + tex->dest_type = nir_get_nir_type_for_glsl_base_type(tex_type); tex->is_array = glsl_sampler_type_is_array(sampler_type); tex->coord_components = tex_pos->num_components; @@ -4338,8 +4337,7 @@ build_nir_tex_op_ms_fetch_sample(struct nir_builder *b, tex->src[2].src = nir_src_for_ssa(tex_deref); tex->src[3].src_type = nir_tex_src_ms_index; tex->src[3].src = nir_src_for_ssa(sample_idx); - tex->dest_type = - nir_alu_type_get_base_type(nir_get_nir_type_for_glsl_base_type(tex_type)); + tex->dest_type = nir_get_nir_type_for_glsl_base_type(tex_type); tex->is_array = false; tex->coord_components = tex_pos->num_components;