commit 763b77946e17811b1fed2617434e8886f8a41b42
author Alexis Hetu <sugoi@google.com> Tue Jul 16 12:03:04 2019 -0400
committer Alexis Hétu <sugoi@google.com> Tue Jul 16 19:35:22 2019 +0000
tree 9a6762c70dd632a419e9ae44c863e0d5355a48e4
parent 6448bd6606392e3fec18b2b7fb7fb43da5a2996e

MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC related assert fix

The assert was firing off when there were already
MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC dynamic descriptors
(which is valid), while the last set layouts contained no
dynamic descriptors, because the offset was already set to
MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC, which shouldn't
matter if there are no dynamic descriptors left.

Bug b/118386749 b/123244275

Change-Id: I1536e6a47b7837c6b052d4e169a5396daf7d34cb
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/34148
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Tested-by: Alexis Hétu <sugoi@google.com>
Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

src/Vulkan/VkPipelineLayout.cpp

diff --git a/src/Vulkan/VkPipelineLayout.cpp b/src/Vulkan/VkPipelineLayout.cpp
index cd47bab..da0d3ae 100644
--- a/src/Vulkan/VkPipelineLayout.cpp
+++ b/src/Vulkan/VkPipelineLayout.cpp
@@ -40,9 +40,10 @@
 	uint32_t dynamicOffsetBase = 0;
 	for (uint32_t i = 0; i < setLayoutCount; i++)
 	{
-		ASSERT_OR_RETURN(dynamicOffsetBase < MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC);
-		dynamicOffsetBases[i] = dynamicOffsetBase;
-		dynamicOffsetBase += setLayouts[i]->getDynamicDescriptorCount();
+		uint32_t dynamicDescriptorCount = setLayouts[i]->getDynamicDescriptorCount();

+		ASSERT_OR_RETURN((dynamicOffsetBase + dynamicDescriptorCount) <= MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC);

+		dynamicOffsetBases[i] = dynamicOffsetBase;

+		dynamicOffsetBase += dynamicDescriptorCount;
 	}
 }