diff options
| author | Bas Nieuwenhuizen <[email protected]> | 2017-06-03 00:01:36 +0200 |
|---|---|---|
| committer | Bas Nieuwenhuizen <[email protected]> | 2017-06-03 22:24:37 +0200 |
| commit | 4415a46be2cbb752b94b62bdf5bc7d4d4bbe9fab (patch) | |
| tree | c1ceeb23ebad8c05702865c3bb1bbce1dda219b4 /src/amd/vulkan/radv_meta.c | |
| parent | 5fb8bb306534d633ceb4e33d89984718326773ba (diff) | |
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 <[email protected]>
Reviewed-by: Dave Airlie <[email protected]>
Fixes: ae61ddabe8c "radv: move userdata sgpr ownership to compiler side."
Diffstat (limited to 'src/amd/vulkan/radv_meta.c')
| -rw-r--r-- | src/amd/vulkan/radv_meta.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index 4f359bd6a9d..263181a57f2 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -50,9 +50,9 @@ 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); if (state->vertex_saved) { 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); |