From 2e62777e0d13d3c2c5aaf72516779e2edfb5e6eb Mon Sep 17 00:00:00 2001 From: Aitor Camacho Date: Wed, 3 Dec 2025 18:49:14 +0900 Subject: [PATCH] kk: Apply robustness only when requested When lowering IO, we would always lower UBOs and SSBOs with robustness enabled. This change only applies robustness if requested by the user. Reviewed-by: Arcady Goldmints-Orlov Signed-off-by: Aitor Camacho Part-of: --- src/kosmickrisp/vulkan/kk_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kosmickrisp/vulkan/kk_shader.c b/src/kosmickrisp/vulkan/kk_shader.c index 2633472d8b9..e19df761439 100644 --- a/src/kosmickrisp/vulkan/kk_shader.c +++ b/src/kosmickrisp/vulkan/kk_shader.c @@ -77,9 +77,9 @@ kk_get_spirv_options(struct vk_physical_device *vk_pdev, { return (struct spirv_to_nir_options){ .environment = NIR_SPIRV_VULKAN, - .ssbo_addr_format = nir_address_format_64bit_bounded_global, + .ssbo_addr_format = kk_buffer_addr_format(rs->storage_buffers), .phys_ssbo_addr_format = nir_address_format_64bit_global, - .ubo_addr_format = nir_address_format_64bit_bounded_global, + .ubo_addr_format = kk_buffer_addr_format(rs->uniform_buffers), .shared_addr_format = nir_address_format_32bit_offset, .min_ssbo_alignment = KK_MIN_SSBO_ALIGNMENT, .min_ubo_alignment = KK_MIN_UBO_ALIGNMENT, @@ -479,9 +479,9 @@ kk_lower_nir(struct kk_device *dev, nir_shader *nir, NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_global, nir_address_format_64bit_global); NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_ssbo, - nir_address_format_64bit_bounded_global); + kk_buffer_addr_format(rs->storage_buffers)); NIR_PASS(_, nir, nir_lower_explicit_io, nir_var_mem_ubo, - nir_address_format_64bit_bounded_global); + kk_buffer_addr_format(rs->uniform_buffers)); NIR_PASS(_, nir, nir_lower_io, nir_var_shader_in | nir_var_shader_out, type_size_vec4,