From f8051f77ea00934cc00d9f55f1a737c50037af65 Mon Sep 17 00:00:00 2001 From: Caio Marcelo de Oliveira Filho Date: Thu, 5 Mar 2020 12:33:05 -0800 Subject: [PATCH] anv: Remove duplicate code in anv_cmd_buffer_bind_descriptor_set Also use a single condition statement instead of two. Reviewed-by: Jason Ekstrand Tested-by: Marge Bot Part-of: --- src/intel/vulkan/anv_cmd_buffer.c | 34 ++++++++++++++++++------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c index 790f1433e0a..0b8e04dd633 100644 --- a/src/intel/vulkan/anv_cmd_buffer.c +++ b/src/intel/vulkan/anv_cmd_buffer.c @@ -618,22 +618,28 @@ anv_cmd_buffer_bind_descriptor_set(struct anv_cmd_buffer *cmd_buffer, struct anv_descriptor_set_layout *set_layout = layout->set[set_index].layout; - VkShaderStageFlags stages = set_layout->shader_stages & - (bind_point == VK_PIPELINE_BIND_POINT_COMPUTE ? - VK_SHADER_STAGE_COMPUTE_BIT : VK_SHADER_STAGE_ALL_GRAPHICS); + VkShaderStageFlags stages = set_layout->shader_stages; + struct anv_cmd_pipeline_state *pipe_state; + + switch (bind_point) { + case VK_PIPELINE_BIND_POINT_GRAPHICS: + stages &= VK_SHADER_STAGE_ALL_GRAPHICS; + pipe_state = &cmd_buffer->state.gfx.base; + break; + + case VK_PIPELINE_BIND_POINT_COMPUTE: + stages &= VK_SHADER_STAGE_COMPUTE_BIT; + pipe_state = &cmd_buffer->state.compute.base; + break; + + default: + unreachable("invalid bind point"); + } VkShaderStageFlags dirty_stages = 0; - if (bind_point == VK_PIPELINE_BIND_POINT_COMPUTE) { - if (cmd_buffer->state.compute.base.descriptors[set_index] != set) { - cmd_buffer->state.compute.base.descriptors[set_index] = set; - dirty_stages |= stages; - } - } else { - assert(bind_point == VK_PIPELINE_BIND_POINT_GRAPHICS); - if (cmd_buffer->state.gfx.base.descriptors[set_index] != set) { - cmd_buffer->state.gfx.base.descriptors[set_index] = set; - dirty_stages |= stages; - } + if (pipe_state->descriptors[set_index] != set) { + pipe_state->descriptors[set_index] = set; + dirty_stages |= stages; } /* If it's a push descriptor set, we have to flag things as dirty -- 2.30.2