From 76ccf7158754aeab0f8a256f02da0f064d11753a Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 20 Feb 2024 17:36:29 +0100 Subject: [PATCH] radv: simplify binding the GS copy shader with ESO Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index b2d3050a1d7..a934704fa7e 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -9372,15 +9372,11 @@ radv_bind_graphics_shaders(struct radv_cmd_buffer *cmd_buffer) assume(last_vgt_api_stage != MESA_SHADER_NONE); cmd_buffer->state.last_vgt_shader = cmd_buffer->state.shaders[last_vgt_api_stage]; - if ((cmd_buffer->state.active_stages & VK_SHADER_STAGE_GEOMETRY_BIT) && - cmd_buffer->state.shader_objs[MESA_SHADER_GEOMETRY]->gs.copy_shader) { - struct radv_shader *gs_copy_shader = cmd_buffer->state.shader_objs[MESA_SHADER_GEOMETRY]->gs.copy_shader; - - cmd_buffer->state.gs_copy_shader = gs_copy_shader; - - radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, gs_copy_shader->bo); - } else { - cmd_buffer->state.gs_copy_shader = NULL; + cmd_buffer->state.gs_copy_shader = cmd_buffer->state.shader_objs[MESA_SHADER_GEOMETRY] + ? cmd_buffer->state.shader_objs[MESA_SHADER_GEOMETRY]->gs.copy_shader + : NULL; + if (cmd_buffer->state.gs_copy_shader) { + radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs, cmd_buffer->state.gs_copy_shader->bo); } /* Determine the rasterized primitive. */