Module: Mesa Branch: main Commit: a19fd0f6347e8e0ae67b56c694377327dcf6f90e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a19fd0f6347e8e0ae67b56c694377327dcf6f90e
Author: Samuel Pitoiset <[email protected]> Date: Wed Mar 22 17:48:02 2023 +0100 radv: replace pipeline->force_vrs_per_vertex during cmdbuf recording Signed-off-by: Samuel Pitoiset <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22128> --- src/amd/vulkan/radv_cmd_buffer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 854053766c7..c1ad0a2e327 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -5044,9 +5044,9 @@ radv_flush_ngg_query_state(struct radv_cmd_buffer *cmd_buffer) static void radv_flush_force_vrs_state(struct radv_cmd_buffer *cmd_buffer) { - struct radv_graphics_pipeline *pipeline = cmd_buffer->state.graphics_pipeline; + const struct radv_shader *last_vgt_shader = cmd_buffer->state.last_vgt_shader; - if (!pipeline->force_vrs_per_vertex) { + if (!last_vgt_shader->info.force_vrs_per_vertex) { /* Un-set the SGPR index so we know to re-emit it later. */ cmd_buffer->state.last_vrs_rates_sgpr_idx = -1; return; @@ -5059,8 +5059,6 @@ radv_flush_force_vrs_state(struct radv_cmd_buffer *cmd_buffer) loc = &cmd_buffer->state.gs_copy_shader->info.user_sgprs_locs.shader_data[AC_UD_FORCE_VRS_RATES]; base_reg = R_00B130_SPI_SHADER_USER_DATA_VS_0; } else { - const struct radv_shader *last_vgt_shader = cmd_buffer->state.last_vgt_shader; - loc = radv_get_user_sgpr(last_vgt_shader, AC_UD_FORCE_VRS_RATES); base_reg = last_vgt_shader->info.user_data_0; }
