From 598e85b3e9f74cd595b2b3414137322b94e713d7 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 28 Jun 2024 14:13:42 +0200 Subject: [PATCH] radv: use the graphics pipeline from the DGC info Doesn't change anything because it's required to bind one graphics pipeline before using DGC but it's cleaner. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_device_generated_commands.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_device_generated_commands.c b/src/amd/vulkan/radv_device_generated_commands.c index 3cea7ba1a18..8705a49d0d4 100644 --- a/src/amd/vulkan/radv_device_generated_commands.c +++ b/src/amd/vulkan/radv_device_generated_commands.c @@ -2366,10 +2366,10 @@ radv_prepare_dgc_graphics(struct radv_cmd_buffer *cmd_buffer, const VkGeneratedC uint16_t vtx_base_sgpr = 0; - if (cmd_buffer->state.graphics_pipeline->vtx_base_sgpr) - vtx_base_sgpr = (cmd_buffer->state.graphics_pipeline->vtx_base_sgpr - SI_SH_REG_OFFSET) >> 2; + if (graphics_pipeline->vtx_base_sgpr) + vtx_base_sgpr = (graphics_pipeline->vtx_base_sgpr - SI_SH_REG_OFFSET) >> 2; - if (cmd_buffer->state.graphics_pipeline->uses_drawid) + if (graphics_pipeline->uses_drawid) vtx_base_sgpr |= DGC_USES_DRAWID; if (layout->draw_mesh_tasks) { @@ -2390,7 +2390,7 @@ radv_prepare_dgc_graphics(struct radv_cmd_buffer *cmd_buffer, const VkGeneratedC params->task_draw_id_sgpr = radv_get_user_sgpr(task_shader, AC_UD_CS_TASK_DRAW_ID); } } else { - if (cmd_buffer->state.graphics_pipeline->uses_baseinstance) + if (graphics_pipeline->uses_baseinstance) vtx_base_sgpr |= DGC_USES_BASEINSTANCE; }