From 1d92ab921b1b033c4722338cf77a6a0fa6e09445 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 11 Aug 2022 14:29:03 +0200 Subject: [PATCH] radv: remove unecessary radv_pipeline::uses_dynamic_stride We can just rely on the dynamic states. Signed-off-by: Samuel Pitoiset Reviewed-By: Mike Blumenkrantz Part-of: --- src/amd/vulkan/radv_cmd_buffer.c | 3 ++- src/amd/vulkan/radv_pipeline.c | 4 ---- src/amd/vulkan/radv_private.h | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index a07cf308ca5..0308cea4c67 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -3628,7 +3628,8 @@ radv_write_vertex_descriptors(const struct radv_cmd_buffer *cmd_buffer, S_008F0C_DATA_FORMAT(V_008F0C_BUF_DATA_FORMAT_32); } - if (pipeline->uses_dynamic_stride) { + if (pipeline->dynamic_states & (RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE | + RADV_DYNAMIC_VERTEX_INPUT)) { stride = cmd_buffer->vertex_bindings[binding].stride; } else { stride = pipeline->binding_stride[binding]; diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 62f8129fb7f..ebeaafed2dc 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -2156,10 +2156,6 @@ radv_pipeline_init_dynamic_state(struct radv_graphics_pipeline *pipeline, dynamic->line_stipple.pattern = info->rs.line_stipple_pattern; } - if (!(states & RADV_DYNAMIC_VERTEX_INPUT_BINDING_STRIDE) || - !(states & RADV_DYNAMIC_VERTEX_INPUT)) - pipeline->uses_dynamic_stride = true; - if (states & RADV_DYNAMIC_FRAGMENT_SHADING_RATE) { dynamic->fragment_shading_rate.size = info->fsr.size; for (int i = 0; i < 2; i++) diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index a9aac7e932e..52cd28eafe7 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -2173,7 +2173,6 @@ struct radv_graphics_pipeline { bool disable_out_of_order_rast_for_occlusion; bool uses_drawid; bool uses_baseinstance; - bool uses_dynamic_stride; bool uses_conservative_overestimate; bool negative_one_to_one; enum radv_depth_clamp_mode depth_clamp_mode;