From: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Date: Wed, 17 Jul 2019 00:58:59 +0000 (+0200)
Subject: radv: Only save the descriptor set if we have one.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f1a89673448227dc22651b0b2d9fc05cbf5d928e;p=mesa.git

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 5e619c2f181..448a6168bd2 100644
--- 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;
 	}