diff options
| -rw-r--r-- | src/amd/vulkan/radv_cmd_buffer.c | 10 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_pipeline.c | 2 | ||||
| -rw-r--r-- | src/amd/vulkan/radv_private.h | 7 |
3 files changed, 12 insertions, 7 deletions
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index ed0a726380b..7e5da5485b3 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -80,9 +80,10 @@ const struct radv_dynamic_state default_dynamic_state = { static void radv_dynamic_state_copy(struct radv_dynamic_state *dest, - const struct radv_dynamic_state *src, - uint32_t copy_mask) + const struct radv_dynamic_state *src) { + uint32_t copy_mask = src->mask; + /* Make sure to copy the number of viewports/scissors because they can * only be specified at pipeline creation time. */ @@ -2531,10 +2532,9 @@ void radv_CmdBindPipeline( cmd_buffer->push_constant_stages |= pipeline->active_stages; /* Apply the dynamic state from the pipeline */ - cmd_buffer->state.dirty |= pipeline->dynamic_state_mask; + cmd_buffer->state.dirty |= pipeline->dynamic_state.mask; radv_dynamic_state_copy(&cmd_buffer->state.dynamic, - &pipeline->dynamic_state, - pipeline->dynamic_state_mask); + &pipeline->dynamic_state); if (pipeline->graphics.esgs_ring_size > cmd_buffer->esgs_ring_size_needed) cmd_buffer->esgs_ring_size_needed = pipeline->graphics.esgs_ring_size; diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c index 2096c994a58..c25642c9667 100644 --- a/src/amd/vulkan/radv_pipeline.c +++ b/src/amd/vulkan/radv_pipeline.c @@ -1137,7 +1137,7 @@ radv_pipeline_init_dynamic_state(struct radv_pipeline *pipeline, } } - pipeline->dynamic_state_mask = states; + pipeline->dynamic_state.mask = states; } static void calculate_gfx9_gs_info(const VkGraphicsPipelineCreateInfo *pCreateInfo, diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h index e80c47482c6..18e057dffbb 100644 --- a/src/amd/vulkan/radv_private.h +++ b/src/amd/vulkan/radv_private.h @@ -733,6 +733,12 @@ struct radv_scissor_state { }; struct radv_dynamic_state { + /** + * Bitmask of (1 << VK_DYNAMIC_STATE_*). + * Defines the set of saved dynamic state. + */ + uint32_t mask; + struct radv_viewport_state viewport; struct radv_scissor_state scissor; @@ -1091,7 +1097,6 @@ struct radv_vertex_elements_info { struct radv_pipeline { struct radv_device * device; - uint32_t dynamic_state_mask; struct radv_dynamic_state dynamic_state; struct radv_pipeline_layout * layout; |