From 1527d02acb315ebf6359b813c7d6f644a2ce501c Mon Sep 17 00:00:00 2001 From: Bas Nieuwenhuizen Date: Wed, 17 Jul 2019 02:58:59 +0200 Subject: [PATCH] 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: Reviewed-by: Dave Airlie (cherry picked from commit f1a89673448227dc22651b0b2d9fc05cbf5d928e) --- src/amd/vulkan/radv_meta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/amd/vulkan/radv_meta.c b/src/amd/vulkan/radv_meta.c index ec4fc4a6d4b..0606d49392f 100644 --- a/src/amd/vulkan/radv_meta.c +++ b/src/amd/vulkan/radv_meta.c @@ -81,7 +81,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; }