fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 22:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21159>
This commit is contained in:
Daniel Schürmann 2023-02-08 10:28:54 +01:00 • committed by Marge Bot
parent 72d9604db0
commit aa362b4b6f
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/amd/vulkan/radv_shader.h
View file

@ -356,7 +356,7 @@ struct radv_shader_info {
uint8_t subgroup_size; uint8_t subgroup_size;
bool uses_sbt; bool is_rt_shader;
bool uses_ray_launch_size; bool uses_ray_launch_size;
bool uses_dynamic_rt_callable_stack; bool uses_dynamic_rt_callable_stack;
bool uses_rt; bool uses_rt;

6
src/amd/vulkan/radv_shader_args.c
View file

@ -185,8 +185,8 @@ allocate_user_sgprs(enum amd_gfx_level gfx_level, const struct radv_shader_info
switch (stage) { switch (stage) {
case MESA_SHADER_COMPUTE: case MESA_SHADER_COMPUTE:
case MESA_SHADER_TASK: case MESA_SHADER_TASK:
if (info->cs.uses_sbt) if (info->cs.is_rt_shader)
user_sgpr_count += 2; user_sgpr_count += 2; /* SBT descriptors */
if (info->cs.uses_grid_size) if (info->cs.uses_grid_size)
user_sgpr_count += args->load_grid_size_from_user_sgpr ? 3 : 2; user_sgpr_count += args->load_grid_size_from_user_sgpr ? 3 : 2;
if (info->cs.uses_ray_launch_size) 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: case MESA_SHADER_TASK:
declare_global_input_sgprs(info, &user_sgpr_info, args); 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); ac_add_arg(&args->ac, AC_ARG_SGPR, 2, AC_ARG_CONST_PTR, &args->ac.sbt_descriptors);
} }

2
src/amd/vulkan/radv_shader_info.c
View file

@ -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); gather_intrinsic_store_output_info(nir, instr, info, consider_force_vrs);
break; break;
case nir_intrinsic_load_sbt_base_amd: case nir_intrinsic_load_sbt_base_amd:
info->cs.uses_sbt = true; info->cs.is_rt_shader = true;
break; break;
case nir_intrinsic_load_rt_dynamic_callable_stack_base_amd: case nir_intrinsic_load_rt_dynamic_callable_stack_base_amd:
info->cs.uses_dynamic_rt_callable_stack = true; info->cs.uses_dynamic_rt_callable_stack = true;