Mesa (master): radv: Increase descriptor limits.

[Bas Nieuwenhuizen]

Module: Mesa
Branch: master
Commit: 6e5e8a2e491f123ac60069951d5a0783f3842169
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6e5e8a2e491f123ac60069951d5a0783f3842169

Author: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Date:   Mon Apr  3 19:40:06 2017 +0200

radv: Increase descriptor limits.

We supported more generally. Decreased the dynamic buffers though, as
we only support 16 for uniform+storage.

Signed-off-by: Bas Nieuwenhuizen <basni at google.com>
Acked-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/radv_device.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index a0d640718a..779e47dc9e 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -549,21 +549,21 @@ void radv_GetPhysicalDeviceProperties(
 		.bufferImageGranularity                   = 64, /* A cache line */
 		.sparseAddressSpaceSize                   = 0xffffffffu, /* buffer max size */
 		.maxBoundDescriptorSets                   = MAX_SETS,
-		.maxPerStageDescriptorSamplers            = 64,
-		.maxPerStageDescriptorUniformBuffers      = 64,
-		.maxPerStageDescriptorStorageBuffers      = 64,
-		.maxPerStageDescriptorSampledImages       = 64,
-		.maxPerStageDescriptorStorageImages       = 64,
-		.maxPerStageDescriptorInputAttachments    = 64,
-		.maxPerStageResources                     = 128,
+		.maxPerStageDescriptorSamplers            = (1u << 31) / 16,
+		.maxPerStageDescriptorUniformBuffers      = (1u << 31) / 16,
+		.maxPerStageDescriptorStorageBuffers      = (1u << 31) / 16,
+		.maxPerStageDescriptorSampledImages       = (1u << 31) / 96,
+		.maxPerStageDescriptorStorageImages       = (1u << 31) / 64,
+		.maxPerStageDescriptorInputAttachments    = (1u << 31) / 64,
+		.maxPerStageResources                     = (1u << 31) / 32,
 		.maxDescriptorSetSamplers                 = 256,
-		.maxDescriptorSetUniformBuffers           = 256,
-		.maxDescriptorSetUniformBuffersDynamic    = 256,
-		.maxDescriptorSetStorageBuffers           = 256,
-		.maxDescriptorSetStorageBuffersDynamic    = 256,
-		.maxDescriptorSetSampledImages            = 256,
-		.maxDescriptorSetStorageImages            = 256,
-		.maxDescriptorSetInputAttachments         = 256,
+		.maxDescriptorSetUniformBuffers           = (1u << 31) / 16,
+		.maxDescriptorSetUniformBuffersDynamic    = 8,
+		.maxDescriptorSetStorageBuffers           = (1u << 31) / 16,
+		.maxDescriptorSetStorageBuffersDynamic    = 8,
+		.maxDescriptorSetSampledImages            = (1u << 31) / 96,
+		.maxDescriptorSetStorageImages            = (1u << 31) / 64,
+		.maxDescriptorSetInputAttachments         = (1u << 31) / 64,
 		.maxVertexInputAttributes                 = 32,
 		.maxVertexInputBindings                   = 32,
 		.maxVertexInputAttributeOffset            = 2047,