From ad3e6bb06a8e598be2381dfe2f5947f872b76bcd Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 17 Sep 2024 16:25:23 +0200 Subject: [PATCH] radv: fix lowering VS inputs when offset >= stride on GFX6-7 This was supposed to be >=. Cc: mesa-stable Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/ci/radv-tahiti-aco-fails.txt | 17 ----------------- src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c | 2 +- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/src/amd/ci/radv-tahiti-aco-fails.txt b/src/amd/ci/radv-tahiti-aco-fails.txt index 3f0d8e88eda..e63d4e71ad0 100644 --- a/src/amd/ci/radv-tahiti-aco-fails.txt +++ b/src/amd/ci/radv-tahiti-aco-fails.txt @@ -1,20 +1,3 @@ -dEQP-VK.pipeline.monolithic.input_attribute_offset.vec2.offset_4.overlapping.no_memory_offset.static,Fail -dEQP-VK.pipeline.monolithic.input_attribute_offset.vec2.offset_4.overlapping.with_memory_offset.static,Fail -dEQP-VK.pipeline.monolithic.input_attribute_offset.vec2.offset_4.packed.no_memory_offset.static,Fail -dEQP-VK.pipeline.monolithic.input_attribute_offset.vec2.offset_4.packed.with_memory_offset.static,Fail -dEQP-VK.pipeline.monolithic.input_attribute_offset.vec4.offset_12.packed.no_memory_offset.static,Fail -dEQP-VK.pipeline.monolithic.input_attribute_offset.vec4.offset_12.packed.with_memory_offset.static,Fail -dEQP-VK.pipeline.monolithic.input_attribute_offset.vec4.offset_4.packed.no_memory_offset.static,Fail -dEQP-VK.pipeline.monolithic.input_attribute_offset.vec4.offset_4.packed.with_memory_offset.static,Fail -dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec2.offset_4.overlapping.no_memory_offset.static,Fail -dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec2.offset_4.overlapping.with_memory_offset.static,Fail -dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec2.offset_4.packed.no_memory_offset.static,Fail -dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec2.offset_4.packed.with_memory_offset.static,Fail -dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec4.offset_12.packed.no_memory_offset.static,Fail -dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec4.offset_12.packed.with_memory_offset.static,Fail -dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec4.offset_4.packed.no_memory_offset.static,Fail -dEQP-VK.pipeline.pipeline_library.input_attribute_offset.vec4.offset_4.packed.with_memory_offset.static,Fail - # Regressions (https://gitlab.freedesktop.org/mesa/mesa/-/issues/11112) dEQP-VK.texture.mipmap.3d.image_view_min_lod.base_level.linear_linear,Fail dEQP-VK.texture.mipmap.3d.image_view_min_lod.base_level.linear_linear_integer_texel_coord,Fail diff --git a/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c b/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c index 377c69f2e1f..57a36ad639c 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c +++ b/src/amd/vulkan/nir/radv_nir_lower_vs_inputs.c @@ -281,7 +281,7 @@ lower_load_vs_input(nir_builder *b, nir_intrinsic_instr *intrin, lower_vs_inputs /* Add excess constant offset to the index. */ unsigned const_off = attrib_offset + count_format_bytes(f, 0, start); - if (attrib_stride && const_off > attrib_stride) { + if (attrib_stride && const_off >= attrib_stride) { index = nir_iadd_imm(b, base_index, const_off / attrib_stride); const_off %= attrib_stride; }