Module: Mesa Branch: main Commit: 7d1cc5ec3da64b607ada2b92555548aa045914e5 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7d1cc5ec3da64b607ada2b92555548aa045914e5
Author: Samuel Pitoiset <samuel.pitoi...@gmail.com> Date: Thu Nov 16 17:22:50 2023 +0100 radv: rename ps_epilog_inputs to colors for PS epilogs Signed-off-by: Samuel Pitoiset <samuel.pitoi...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26231> --- src/amd/vulkan/radv_aco_shader_info.h | 2 +- src/amd/vulkan/radv_shader_args.c | 2 +- src/amd/vulkan/radv_shader_args.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/amd/vulkan/radv_aco_shader_info.h b/src/amd/vulkan/radv_aco_shader_info.h index 8df3f31b3bd..b8f0579e660 100644 --- a/src/amd/vulkan/radv_aco_shader_info.h +++ b/src/amd/vulkan/radv_aco_shader_info.h @@ -116,7 +116,7 @@ radv_aco_convert_ps_epilog_key(struct aco_ps_epilog_info *aco_info, const struct ASSIGN_FIELD(color_is_int10); ASSIGN_FIELD(mrt0_is_dual_src); - memcpy(aco_info->colors, radv_args->ps_epilog_inputs, sizeof(aco_info->colors)); + memcpy(aco_info->colors, radv_args->colors, sizeof(aco_info->colors)); aco_info->alpha_func = COMPARE_FUNC_ALWAYS; } diff --git a/src/amd/vulkan/radv_shader_args.c b/src/amd/vulkan/radv_shader_args.c index 16d9406a171..0b57750cbc7 100644 --- a/src/amd/vulkan/radv_shader_args.c +++ b/src/amd/vulkan/radv_shader_args.c @@ -832,7 +832,7 @@ radv_declare_ps_epilog_args(const struct radv_device *device, const struct radv_ if (col_format == V_028714_SPI_SHADER_ZERO) continue; - ac_add_arg(&args->ac, AC_ARG_VGPR, 4, AC_ARG_FLOAT, &args->ps_epilog_inputs[i]); + ac_add_arg(&args->ac, AC_ARG_VGPR, 4, AC_ARG_FLOAT, &args->colors[i]); } } diff --git a/src/amd/vulkan/radv_shader_args.h b/src/amd/vulkan/radv_shader_args.h index f65cd558448..07c6acfad6e 100644 --- a/src/amd/vulkan/radv_shader_args.h +++ b/src/amd/vulkan/radv_shader_args.h @@ -61,7 +61,7 @@ struct radv_shader_args { struct ac_arg vs_inputs[MAX_VERTEX_ATTRIBS]; /* PS epilogs */ - struct ac_arg ps_epilog_inputs[MAX_RTS]; + struct ac_arg colors[MAX_RTS]; /* TCS */ /* # [0:5] = the number of patch control points
