From ffb46c88261a2443a17740d491374266c62aea67 Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Sat, 3 Jun 2017 00:01:36 +0200 Subject: [PATCH] radv: Dirty all descriptors sets when changing the pipeline. Sets could have been ignored during previous descriptor set flush due to the shader not using them and therefore no SGPR being assigned. Signed-off-by: Bas Nieuwenhuizen Reviewed-by: Dave Airlie Fixes: ae61ddabe8c "radv: move userdata sgpr ownership to compiler side." (cherry picked from commit 4415a46be2cbb752b94b62bdf5bc7d4d4bbe9fab) Conflicts: src/amd/vulkan/radv_cmd_buffer.c src/amd/vulkan/radv_meta.c --- src/amd/vulkan/radv_cmd_buffer.c | 17 ++++++++++++----- src/amd/vulkan/radv_meta.c | 5 ++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c index efeb34c4723..fd155411fe1 100644 --- a/src/amd/vulkan/radv_cmd_buffer.c +++ b/src/amd/vulkan/radv_cmd_buffer.c @@ -2152,6 +2152,13 @@ radv_emit_compute_pipeline(struct radv_cmd_buffer *cmd_buffer) assert(cmd_buffer->cs->cdw <= cdw_max); } +static void radv_mark_descriptor_sets_dirty(struct radv_cmd_buffer *cmd_buffer) +{ + for (unsigned i = 0; i < MAX_SETS; i++) { + if (cmd_buffer->state.descriptors[i]) + cmd_buffer->state.descriptors_dirty |= (1u << i); + } +} void radv_CmdBindPipeline( VkCommandBuffer commandBuffer, @@ -2161,10 +2168,7 @@ void radv_CmdBindPipeline( RADV_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer); RADV_FROM_HANDLE(radv_pipeline, pipeline, _pipeline); - for (unsigned i = 0; i < MAX_SETS; i++) { - if (cmd_buffer->state.descriptors[i]) - cmd_buffer->state.descriptors_dirty |= (1 << i); - } + radv_mark_descriptor_sets_dirty(cmd_buffer); switch (pipelineBindPoint) { case VK_PIPELINE_BIND_POINT_COMPUTE: @@ -2173,6 +2177,9 @@ void radv_CmdBindPipeline( break; case VK_PIPELINE_BIND_POINT_GRAPHICS: cmd_buffer->state.pipeline = pipeline; + if (!pipeline) + break; + cmd_buffer->state.vertex_descriptors_dirty = true; cmd_buffer->state.dirty |= RADV_CMD_DIRTY_PIPELINE; cmd_buffer->push_constant_stages |= pipeline->active_stages; @@ -2335,7 +2342,6 @@ void radv_CmdSetStencilReference( cmd_buffer->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_STENCIL_REFERENCE; } - void radv_CmdExecuteCommands( VkCommandBuffer commandBuffer, uint32_t commandBufferCount, @@ -2380,6 +2386,7 @@ void radv_CmdExecuteCommands( primary->state.dirty |= RADV_CMD_DIRTY_DYNAMIC_ALL; primary->state.last_primitive_reset_en = -1; primary->state.last_primitive_reset_index = 0; + radv_mark_descriptor_sets_dirty(primary); } } diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index d8d2568b549..fac0dcf6d74 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -51,10 +51,10 @@ void radv_meta_restore(const struct radv_meta_saved_state *state, struct radv_cmd_buffer *cmd_buffer) { - cmd_buffer->state.pipeline = state->old_pipeline; + radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer), VK_PIPELINE_BIND_POINT_GRAPHICS, + radv_pipeline_to_handle(state->old_pipeline)); cmd_buffer->state.descriptors[0] = state->old_descriptor_set0; - cmd_buffer->state.descriptors_dirty |= (1u << 0); memcpy(cmd_buffer->state.vertex_bindings, state->old_vertex_bindings, sizeof(state->old_vertex_bindings)); @@ -114,7 +114,6 @@ radv_meta_restore_compute(const struct radv_meta_saved_compute_state *state, radv_pipeline_to_handle(state->old_pipeline)); cmd_buffer->state.descriptors[0] = state->old_descriptor_set0; - cmd_buffer->state.descriptors_dirty |= (1u << 0); if (push_constant_size) { memcpy(cmd_buffer->push_constants, state->push_constants, push_constant_size);