radv: Only save the descriptor set if we have one.

After reset, if valid does not contain the relevant bit the descriptor
can be != NULL but still not be valid.

CC: <mesa-stable@lists.freedesktop.org>
Reviewed-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c
index 5e619c2f181644e936b0a0a7e100cfa87f81dde3..448a6168bd219a5d9b2450d0e503644221e0132b 100644 (file)
--- a/src/amd/vulkan/radv_meta.c
+++ b/src/amd/vulkan/radv_meta.c
@@ -86,7 +86,7 @@ radv_meta_save(struct radv_meta_saved_state *state,
 
        if (state->flags & RADV_META_SAVE_DESCRIPTORS) {
                state->old_descriptor_set0 = descriptors_state->sets[0];
-               if (!state->old_descriptor_set0)
+               if (!(descriptors_state->valid & 1) || !state->old_descriptor_set0)
                        state->flags &= ~RADV_META_SAVE_DESCRIPTORS;
        }