Update simple limits for Vulkan's 2022 profile
The Vulkan Roadmap 2022 profile requires more strict limits than the
core Vulkan spec. These are the limits that shouldn't require further
code modifications to function, so they can be updated to the profile's
values all together.
Bug: b/226657516
Tests: dEQP-VK.*
Change-Id: I06534ec1a86930d6f06be747b77473a0d4fa296a
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/64548
Tested-by: Sean Risser <srisser@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
Commit-Queue: Sean Risser <srisser@google.com>
diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 5ad14dd..010c270 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -607,23 +607,23 @@
vk::MAX_PUSH_CONSTANT_SIZE, // maxPushConstantsSize
4096, // maxMemoryAllocationCount
vk::MAX_SAMPLER_ALLOCATION_COUNT, // maxSamplerAllocationCount
- 131072, // bufferImageGranularity
+ 4096, // bufferImageGranularity
0, // sparseAddressSpaceSize (unsupported)
MAX_BOUND_DESCRIPTOR_SETS, // maxBoundDescriptorSets
- 16, // maxPerStageDescriptorSamplers
- 14, // maxPerStageDescriptorUniformBuffers
- 16, // maxPerStageDescriptorStorageBuffers
- 16, // maxPerStageDescriptorSampledImages
- 4, // maxPerStageDescriptorStorageImages
+ 64, // maxPerStageDescriptorSamplers
+ 15, // maxPerStageDescriptorUniformBuffers
+ 30, // maxPerStageDescriptorStorageBuffers
+ 200, // maxPerStageDescriptorSampledImages
+ 16, // maxPerStageDescriptorStorageImages
sw::MAX_COLOR_BUFFERS, // maxPerStageDescriptorInputAttachments
- 128, // maxPerStageResources
- 96, // maxDescriptorSetSamplers
- 72, // maxDescriptorSetUniformBuffers
+ 200, // maxPerStageResources
+ 576, // maxDescriptorSetSamplers
+ 90, // maxDescriptorSetUniformBuffers
MAX_DESCRIPTOR_SET_UNIFORM_BUFFERS_DYNAMIC, // maxDescriptorSetUniformBuffersDynamic
- 24, // maxDescriptorSetStorageBuffers
+ 96, // maxDescriptorSetStorageBuffers
MAX_DESCRIPTOR_SET_STORAGE_BUFFERS_DYNAMIC, // maxDescriptorSetStorageBuffersDynamic
- 96, // maxDescriptorSetSampledImages
- 24, // maxDescriptorSetStorageImages
+ 1800, // maxDescriptorSetSampledImages
+ 144, // maxDescriptorSetStorageImages
sw::MAX_COLOR_BUFFERS, // maxDescriptorSetInputAttachments
16, // maxVertexInputAttributes
vk::MAX_VERTEX_INPUT_BINDINGS, // maxVertexInputBindings
