Fix vkGetDescriptorSetLayoutSupport implementation

The purpose of this function is to express *additional* restrictions beyond those imposed by the device limits. We have no such restrictions to impose, so should *always* claim support, not *never*. Test: dEQP-VK.api.maintenance3_check.descriptor_set Bug: b/145007346 Change-Id: Ibacc9336c0900fe0d7af239c58b930bcd13bcd3b Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/38549Tested-by: Chris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Fix vkGetDescriptorSetLayoutSupport implementation
aee3c369 · Chris Forbes · e823bb0c · aee3c369
Commit aee3c369 authored Nov 22, 2019 by Chris Forbes
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

VkDevice.cpp src/Vulkan/VkDevice.cpp +7 -2

No files found.
--- a/src/Vulkan/VkDevice.cpp
+++ b/src/Vulkan/VkDevice.cpp
@@ -214,8 +214,13 @@ VkResult Device::waitIdle()
 void Device::getDescriptorSetLayoutSupport(const VkDescriptorSetLayoutCreateInfo* pCreateInfo,
                                           VkDescriptorSetLayoutSupport* pSupport) const
 {
-	// Mark everything as unsupported
+	// From Vulkan Spec 13.2.1 Descriptor Set Layout, in description of vkGetDescriptorSetLayoutSupport:
-	pSupport->supported = VK_FALSE;
+	// "This command does not consider other limits such as maxPerStageDescriptor*, and so a descriptor
+	// set layout that is supported according to this command must still satisfy the pipeline layout limits
+	// such as maxPerStageDescriptor* in order to be used in a pipeline layout."
+	// We have no "strange" limitations to enforce beyond the device limits, so we can safely always claim support.
+	pSupport->supported = VK_TRUE;
 }
 void Device::updateDescriptorSets(uint32_t descriptorWriteCount, const VkWriteDescriptorSet* pDescriptorWrites,