From 42dc4b463b57a26e6c97d490a162bd4b3a82a0e2 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 29 Apr 2024 14:32:43 +0200 Subject: [PATCH] radv: add GS copy shader BO to the cmdbuf BO list at bind time Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index 6de25641256..b22f3f2c4d0 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -1972,10 +1972,6 @@ radv_emit_graphics_pipeline(struct radv_cmd_buffer *cmd_buffer) radv_cs_add_buffer(device->ws, cmd_buffer->cs, shader->bo); } - if (cmd_buffer->state.gs_copy_shader) { - radv_cs_add_buffer(device->ws, cmd_buffer->cs, cmd_buffer->state.gs_copy_shader->bo); - } - struct radv_shader *task_shader = cmd_buffer->state.shaders[MESA_SHADER_TASK]; if (task_shader) { radv_emit_compute_shader(pdev, cmd_buffer->gang.cs, task_shader); @@ -6818,10 +6814,15 @@ radv_bind_geometry_shader(struct radv_cmd_buffer *cmd_buffer, const struct radv_ static void radv_bind_gs_copy_shader(struct radv_cmd_buffer *cmd_buffer, struct radv_shader *gs_copy_shader) { + struct radv_device *device = radv_cmd_buffer_device(cmd_buffer); + cmd_buffer->state.gs_copy_shader = gs_copy_shader; - if (gs_copy_shader) + if (gs_copy_shader) { cmd_buffer->shader_upload_seq = MAX2(cmd_buffer->shader_upload_seq, gs_copy_shader->upload_seq); + + radv_cs_add_buffer(device->ws, cmd_buffer->cs, gs_copy_shader->bo); + } } static void @@ -9693,10 +9694,6 @@ radv_bind_graphics_shaders(struct radv_cmd_buffer *cmd_buffer) radv_bind_gs_copy_shader(cmd_buffer, gs_copy_shader); - if (cmd_buffer->state.gs_copy_shader) { - radv_cs_add_buffer(device->ws, cmd_buffer->cs, cmd_buffer->state.gs_copy_shader->bo); - } - /* Determine NGG GS info. */ if (cmd_buffer->state.shaders[MESA_SHADER_GEOMETRY] && cmd_buffer->state.shaders[MESA_SHADER_GEOMETRY]->info.is_ngg &&