radv: rename shader_info->cs.uses_sbt -> shader_info->cs.is_rt_shader

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21159>

diff --git a/src/amd/vulkan/radv_shader.h b/src/amd/vulkan/radv_shader.h
index faaf630..f928e3d 100644 (file)
--- a/src/amd/vulkan/radv_shader.h
+++ b/src/amd/vulkan/radv_shader.h
@@ -356,7 +356,7 @@ struct radv_shader_info {
 
       uint8_t subgroup_size;
 
-      bool uses_sbt;
+      bool is_rt_shader;
       bool uses_ray_launch_size;
       bool uses_dynamic_rt_callable_stack;
       bool uses_rt;

diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c
index 936b387..a969f9d 100644 (file)
--- a/src/amd/vulkan/radv_shader_args.c
+++ b/src/amd/vulkan/radv_shader_args.c
@@ -185,8 +185,8 @@ allocate_user_sgprs(enum amd_gfx_level gfx_level, const struct radv_shader_info
    switch (stage) {
    case MESA_SHADER_COMPUTE:
    case MESA_SHADER_TASK:
-      if (info->cs.uses_sbt)
-         user_sgpr_count += 2;
+      if (info->cs.is_rt_shader)
+         user_sgpr_count += 2; /* SBT descriptors */
       if (info->cs.uses_grid_size)
          user_sgpr_count += args->load_grid_size_from_user_sgpr ? 3 : 2;
       if (info->cs.uses_ray_launch_size)
@@ -597,7 +597,7 @@ radv_declare_shader_args(enum amd_gfx_level gfx_level, const struct radv_pipelin
    case MESA_SHADER_TASK:
       declare_global_input_sgprs(info, &user_sgpr_info, args);
 
-      if (info->cs.uses_sbt) {
+      if (info->cs.is_rt_shader) {
          ac_add_arg(&args->ac, AC_ARG_SGPR, 2, AC_ARG_CONST_PTR, &args->ac.sbt_descriptors);
       }
 

diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c
index 79d9f33..3661046 100644 (file)
--- a/src/amd/vulkan/radv_shader_info.c
+++ b/src/amd/vulkan/radv_shader_info.c
@@ -224,7 +224,7 @@ gather_intrinsic_info(const nir_shader *nir, const nir_intrinsic_instr *instr,
       gather_intrinsic_store_output_info(nir, instr, info, consider_force_vrs);
       break;
    case nir_intrinsic_load_sbt_base_amd:
-      info->cs.uses_sbt = true;
+      info->cs.is_rt_shader = true;
       break;
    case nir_intrinsic_load_rt_dynamic_callable_stack_base_amd:
       info->cs.uses_dynamic_rt_callable_stack = true;