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/+/34148Reviewed-by: Nicolas Capens <nicolascapens@google.com> Tested-by: Alexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

MAX_DESCRIPTOR_SET_COMBINED_BUFFERS_DYNAMIC related assert fix
763b7794 · Alexis Hetu · Alexis Hétu · 6448bd66 · 763b7794
Commit 763b7794 authored Jul 16, 2019 by Alexis Hetu Committed by Alexis Hétu Jul 16, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

VkPipelineLayout.cpp src/Vulkan/VkPipelineLayout.cpp +4 -3

No files found.
--- a/src/Vulkan/VkPipelineLayout.cpp
+++ b/src/Vulkan/VkPipelineLayout.cpp
@@ -40,9 +40,10 @@ PipelineLayout::PipelineLayout(const VkPipelineLayoutCreateInfo* pCreateInfo, vo
 	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;
 	}
 }