From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Mon, 17 Sep 2018 09:20:57 +0000 (+0200)
Subject: Revert "radv: Optimize rebinding the same descriptor set."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6521d4a659b911bb86d979564de03665616a671e;p=mesa.git

Revert "radv: Optimize rebinding the same descriptor set."

This introduces random GPU hangs on Vega, at least.

This reverts commit 02a43edf186cb9998741ba765cb948bb238a122d.
---

diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 2f168321197..d492456d6b8 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -2464,13 +2464,7 @@ void radv_CmdBindDescriptorSets(
 	for (unsigned i = 0; i < descriptorSetCount; ++i) {
 		unsigned idx = i + firstSet;
 		RADV_FROM_HANDLE(radv_descriptor_set, set, pDescriptorSets[i]);
-
-		/* If the set is already bound we only need to update the
-		 * (potentially changed) dynamic offsets. */
-		if (descriptors_state->sets[idx] != set ||
-		    !(descriptors_state->valid & (1u << idx))) {
-			radv_bind_descriptor_set(cmd_buffer, pipelineBindPoint, set, idx);
-		}
+		radv_bind_descriptor_set(cmd_buffer, pipelineBindPoint, set, idx);
 
 		for(unsigned j = 0; j < set->layout->dynamic_offset_count; ++j, ++dyn_idx) {
 			unsigned idx = j + layout->set[i + firstSet].dynamic_offset_start;