diff options
| author | Fredrik Höglund <[email protected]> | 2017-05-02 17:09:27 +0200 |
|---|---|---|
| committer | Fredrik Höglund <[email protected]> | 2017-05-06 01:46:18 +0200 |
| commit | 5ff48581119258214801de24a327bdd6a29e0ccc (patch) | |
| tree | 735109a70a861d0982a49b3984f58e0157460627 /src/amd/vulkan/radv_meta.c | |
| parent | f6ac3d0db67dd81f0aff754b977ed1277b33af63 (diff) | |
radv/meta: fix restoring a push descriptor set
radv_bind_descriptor_set cannot be used to bind a push descriptor set
since a push descriptor set does not have a buffer list. However,
there is no need to add the buffers again when restoring a set, so
this fix is also an optimization.
Cc: "17.1" <[email protected]>
Signed-off-by: Fredrik Höglund <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Diffstat (limited to 'src/amd/vulkan/radv_meta.c')
| -rw-r--r-- | src/amd/vulkan/radv_meta.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index aed2607c22c..1fa0e53a33c 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -63,7 +63,8 @@ radv_meta_restore(const struct radv_meta_saved_state *state, { cmd_buffer->state.pipeline = state->old_pipeline; if (state->vertex_saved) { - radv_bind_descriptor_set(cmd_buffer, state->old_descriptor_set0, 0); + 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)); cmd_buffer->state.vb_dirty |= (1 << RADV_META_VERTEX_BINDING_COUNT) - 1; @@ -122,7 +123,9 @@ radv_meta_restore_compute(const struct radv_meta_saved_compute_state *state, { radv_CmdBindPipeline(radv_cmd_buffer_to_handle(cmd_buffer), VK_PIPELINE_BIND_POINT_COMPUTE, radv_pipeline_to_handle(state->old_pipeline)); - radv_bind_descriptor_set(cmd_buffer, state->old_descriptor_set0, 0); + + 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); |