Make UpdateAfterBind descriptor limits equal to base limits
The Vulkan 1.2.182 spec mandates that "The UpdateAfterBind descriptor
limits must each be greater than or equal to the corresponding
non-UpdateAfterBind limit."
Note that at the moment we do not advertise any of the update after bind
features (e.g. descriptorBindingSampledImageUpdateAfterBind), but the
Vulkan Validation Layers still expect these limits to be non-0.
A descriptor pool creation flag and a descriptor binding flag which are
disallowed when the features are not enabled prevent actual update after
bind usage.
Bug: swiftshader:160
Change-Id: Icce2ba987cb67a87544a406df144dfce8026b3f6
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/55108
Tested-by: Nicolas Capens <nicolascapens@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 5493ea4..0254d4b 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -422,12 +422,12 @@
}
}
-VkSampleCountFlags PhysicalDevice::getSampleCounts() const
+VkSampleCountFlags PhysicalDevice::getSampleCounts()
{
return VK_SAMPLE_COUNT_1_BIT | VK_SAMPLE_COUNT_4_BIT;
}
-const VkPhysicalDeviceLimits &PhysicalDevice::getLimits() const
+const VkPhysicalDeviceLimits &PhysicalDevice::getLimits()
{
VkSampleCountFlags sampleCounts = getSampleCounts();
@@ -945,6 +945,10 @@
template<typename T>
static void getDescriptorIndexingProperties(T *properties)
{
+ // "The UpdateAfterBind descriptor limits must each be greater than or equal to
+ // the corresponding non-UpdateAfterBind limit."
+ const VkPhysicalDeviceLimits &limits = PhysicalDevice::getLimits();
+
properties->maxUpdateAfterBindDescriptorsInAllPools = 0;
properties->shaderUniformBufferArrayNonUniformIndexingNative = VK_FALSE;
properties->shaderSampledImageArrayNonUniformIndexingNative = VK_FALSE;
@@ -953,21 +957,21 @@
properties->shaderInputAttachmentArrayNonUniformIndexingNative = VK_FALSE;
properties->robustBufferAccessUpdateAfterBind = VK_FALSE;
properties->quadDivergentImplicitLod = VK_FALSE;
- properties->maxPerStageDescriptorUpdateAfterBindSamplers = 0;
- properties->maxPerStageDescriptorUpdateAfterBindUniformBuffers = 0;
- properties->maxPerStageDescriptorUpdateAfterBindStorageBuffers = 0;
- properties->maxPerStageDescriptorUpdateAfterBindSampledImages = 0;
- properties->maxPerStageDescriptorUpdateAfterBindStorageImages = 0;
- properties->maxPerStageDescriptorUpdateAfterBindInputAttachments = 0;
- properties->maxPerStageUpdateAfterBindResources = 0;
- properties->maxDescriptorSetUpdateAfterBindSamplers = 0;
- properties->maxDescriptorSetUpdateAfterBindUniformBuffers = 0;
- properties->maxDescriptorSetUpdateAfterBindUniformBuffersDynamic = 0;
- properties->maxDescriptorSetUpdateAfterBindStorageBuffers = 0;
- properties->maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = 0;
- properties->maxDescriptorSetUpdateAfterBindSampledImages = 0;
- properties->maxDescriptorSetUpdateAfterBindStorageImages = 0;
- properties->maxDescriptorSetUpdateAfterBindInputAttachments = 0;
+ properties->maxPerStageDescriptorUpdateAfterBindSamplers = limits.maxPerStageDescriptorSamplers;
+ properties->maxPerStageDescriptorUpdateAfterBindUniformBuffers = limits.maxPerStageDescriptorUniformBuffers;
+ properties->maxPerStageDescriptorUpdateAfterBindStorageBuffers = limits.maxPerStageDescriptorStorageBuffers;
+ properties->maxPerStageDescriptorUpdateAfterBindSampledImages = limits.maxPerStageDescriptorSampledImages;
+ properties->maxPerStageDescriptorUpdateAfterBindStorageImages = limits.maxPerStageDescriptorStorageImages;
+ properties->maxPerStageDescriptorUpdateAfterBindInputAttachments = limits.maxPerStageDescriptorInputAttachments;
+ properties->maxPerStageUpdateAfterBindResources = limits.maxPerStageResources;
+ properties->maxDescriptorSetUpdateAfterBindSamplers = limits.maxDescriptorSetSamplers;
+ properties->maxDescriptorSetUpdateAfterBindUniformBuffers = limits.maxDescriptorSetUniformBuffers;
+ properties->maxDescriptorSetUpdateAfterBindUniformBuffersDynamic = limits.maxDescriptorSetUniformBuffersDynamic;
+ properties->maxDescriptorSetUpdateAfterBindStorageBuffers = limits.maxDescriptorSetStorageBuffers;
+ properties->maxDescriptorSetUpdateAfterBindStorageBuffersDynamic = limits.maxDescriptorSetStorageBuffersDynamic;
+ properties->maxDescriptorSetUpdateAfterBindSampledImages = limits.maxDescriptorSetSampledImages;
+ properties->maxDescriptorSetUpdateAfterBindStorageImages = limits.maxDescriptorSetStorageImages;
+ properties->maxDescriptorSetUpdateAfterBindInputAttachments = limits.maxDescriptorSetInputAttachments;
}
void PhysicalDevice::getProperties(VkPhysicalDeviceDescriptorIndexingProperties *properties) const
diff --git a/src/Vulkan/VkPhysicalDevice.hpp b/src/Vulkan/VkPhysicalDevice.hpp
index 0b4fe59..ba400af 100644
--- a/src/Vulkan/VkPhysicalDevice.hpp
+++ b/src/Vulkan/VkPhysicalDevice.hpp
@@ -79,9 +79,10 @@
VkQueueFamilyProperties2 *pQueueFamilyProperties) const;
static const VkPhysicalDeviceMemoryProperties &GetMemoryProperties();
+ static const VkPhysicalDeviceLimits &getLimits();
+
private:
- const VkPhysicalDeviceLimits &getLimits() const;
- VkSampleCountFlags getSampleCounts() const;
+ static VkSampleCountFlags getSampleCounts();
VkQueueFamilyProperties getQueueFamilyProperties() const;
};
