From fc2aecd2c969dcac3a0ffd969240f23d63dac1c1 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Tue, 22 Oct 2024 17:09:18 -0700 Subject: [PATCH] panvk: fix texture size/levels/samples query Fix an off-by-one for user sets in load_resource_deref_desc. Part-of: --- src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c b/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c index 91373701918..3b8c08c2595 100644 --- a/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c +++ b/src/panfrost/vulkan/panvk_vX_nir_lower_descriptors.c @@ -570,9 +570,10 @@ load_resource_deref_desc(nir_builder *b, nir_deref_instr *deref, nir_iadd(b, set_base_addr, nir_u2u64(b, set_offset)), desc_align, num_components, bit_size); #else + /* note that user sets start from index 1 */ return nir_load_ubo( b, num_components, bit_size, - nir_imm_int(b, pan_res_handle(VALHALL_RESOURCE_TABLE_IDX, set)), + nir_imm_int(b, pan_res_handle(VALHALL_RESOURCE_TABLE_IDX, set + 1)), set_offset, .range = ~0u, .align_mul = PANVK_DESCRIPTOR_SIZE, .align_offset = desc_offset); #endif