commit d4550ab8d3f0ba1ac26f5cd62f67be68a56b328f
author Jamie Madill <jmadill@chromium.org> Tue Mar 23 15:49:23 2021 -0400
committer swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com <swiftshader-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Mar 25 21:59:29 2021 +0000
tree 5980867901c760a8a03b33d200aedba259a001d7
parent 8969f861fc24e2e630df46e2e9a625abfbe00e57

Increase render target limit to 8.

Some of ANGLE's GLES traces currently require a higher limit.

Bug: b/183524100
Change-Id: Id8d9df4318292b2f8ae2fdf5b1e1349ed7c92d48
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/53808
Presubmit-Ready: Jamie Madill <jmadill@chromium.org>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>

src/Vulkan/VkPhysicalDevice.cpp

diff --git a/src/Vulkan/VkPhysicalDevice.cpp b/src/Vulkan/VkPhysicalDevice.cpp
index 3023458..7e72f34 100644
--- a/src/Vulkan/VkPhysicalDevice.cpp
+++ b/src/Vulkan/VkPhysicalDevice.cpp
@@ -442,7 +442,7 @@
 		16,                                               // maxPerStageDescriptorStorageBuffers
 		16,                                               // maxPerStageDescriptorSampledImages
 		4,                                                // maxPerStageDescriptorStorageImages
-		4,                                                // maxPerStageDescriptorInputAttachments
+		sw::RENDERTARGETS,                                // maxPerStageDescriptorInputAttachments
 		128,                                              // maxPerStageResources
 		96,                                               // maxDescriptorSetSamplers
 		72,                                               // maxDescriptorSetUniformBuffers
@@ -451,7 +451,7 @@
 		MAX_DESCRIPTOR_SET_STORAGE_BUFFERS_DYNAMIC,       // maxDescriptorSetStorageBuffersDynamic
 		96,                                               // maxDescriptorSetSampledImages
 		24,                                               // maxDescriptorSetStorageImages
-		4,                                                // maxDescriptorSetInputAttachments
+		sw::RENDERTARGETS,                                // maxDescriptorSetInputAttachments
 		16,                                               // maxVertexInputAttributes
 		vk::MAX_VERTEX_INPUT_BINDINGS,                    // maxVertexInputBindings
 		2047,                                             // maxVertexInputAttributeOffset
@@ -471,7 +471,7 @@
 		0,                                                // maxGeometryOutputVertices (unsupported)
 		0,                                                // maxGeometryTotalOutputComponents (unsupported)
 		sw::MAX_INTERFACE_COMPONENTS,                     // maxFragmentInputComponents
-		4,                                                // maxFragmentOutputAttachments
+		sw::RENDERTARGETS,                                // maxFragmentOutputAttachments
 		1,                                                // maxFragmentDualSrcAttachments
 		4,                                                // maxFragmentCombinedOutputResources
 		16384,                                            // maxComputeSharedMemorySize
@@ -507,7 +507,7 @@
 		sampleCounts,                                     // framebufferDepthSampleCounts
 		sampleCounts,                                     // framebufferStencilSampleCounts
 		sampleCounts,                                     // framebufferNoAttachmentsSampleCounts
-		4,                                                // maxColorAttachments
+		sw::RENDERTARGETS,                                // maxColorAttachments
 		sampleCounts,                                     // sampledImageColorSampleCounts
 		sampleCounts,                                     // sampledImageIntegerSampleCounts
 		sampleCounts,                                     // sampledImageDepthSampleCounts