Module: Mesa Branch: main Commit: 3e36b47b962535fdf3561ca9db94ce9e6dad64b4 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3e36b47b962535fdf3561ca9db94ce9e6dad64b4
Author: Joshua Ashton <[email protected]> Date: Wed Jun 28 18:28:57 2023 +0100 radv: Rename radv_nir_compiler_options::robust_buffer_access to robust_buffer_access_llvm This is only used by LLVM, make that clearer. Signed-off-by: Joshua Ashton <[email protected]> Reviewed-by: Friedrich Vock <[email protected]> Reviewed-by: Bas Nieuwenhuizen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23912> --- src/amd/vulkan/radv_nir_to_llvm.c | 2 +- src/amd/vulkan/radv_shader.c | 3 ++- src/amd/vulkan/radv_shader.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_nir_to_llvm.c b/src/amd/vulkan/radv_nir_to_llvm.c index a45f29707bb..155fd45a0a7 100644 --- a/src/amd/vulkan/radv_nir_to_llvm.c +++ b/src/amd/vulkan/radv_nir_to_llvm.c @@ -363,7 +363,7 @@ ac_translate_nir_to_llvm(struct ac_llvm_compiler *ac_llvm, const struct radv_nir ctx.abi.load_ssbo = radv_load_ssbo; ctx.abi.load_sampler_desc = radv_get_sampler_desc; ctx.abi.clamp_shadow_reference = false; - ctx.abi.robust_buffer_access = options->robust_buffer_access; + ctx.abi.robust_buffer_access = options->robust_buffer_access_llvm; ctx.abi.load_grid_size_from_user_sgpr = args->load_grid_size_from_user_sgpr; bool is_ngg = is_pre_gs_stage(shaders[0]->info.stage) && info->is_ngg; diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 00ee22b3db8..04200944cfa 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -2041,7 +2041,8 @@ radv_fill_nir_compiler_options(struct radv_nir_compiler_options *options, struct if (key) options->key = *key; - options->robust_buffer_access = device->buffer_robustness >= RADV_BUFFER_ROBUSTNESS_1; + /* robust_buffer_access_llvm here used by LLVM only, pipeline robustness is not exposed there. */ + options->robust_buffer_access_llvm = device->buffer_robustness >= RADV_BUFFER_ROBUSTNESS_1; options->wgp_mode = should_use_wgp; options->info = &device->physical_device->rad_info; options->dump_shader = can_dump_shader; diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h index 8efffb05896..8e773d81fa8 100644 --- a/src/amd/vulkan/radv_shader.h +++ b/src/amd/vulkan/radv_shader.h @@ -132,7 +132,7 @@ struct radv_pipeline_key { struct radv_nir_compiler_options { struct radv_pipeline_key key; - bool robust_buffer_access; + bool robust_buffer_access_llvm; bool dump_shader; bool dump_preoptir; bool record_ir;
