From: Matthew Netsch Date: Wed, 26 Aug 2020 02:41:11 +0000 (-0700) Subject: Fixes descriptor indexing tests X-Git-Tag: upstream/1.3.5~1126^2~2^2^2^2^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=360c75482e892fe56fda6dc5c4c9a0f12fb36d45;p=platform%2Fupstream%2FVK-GL-CTS.git Fixes descriptor indexing tests Tests were exceeding the max number of input attachments Components: Vulkan VK-GL-CTS Issue: 2561 Affects: dEQP-VK.descriptor_indexing.* Change-Id: If135ecee8aca6480d28f2e66ca574a5a9fbbc201 --- diff --git a/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTestsUtils.cpp b/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTestsUtils.cpp index c81b845..22ef4ee 100644 --- a/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTestsUtils.cpp +++ b/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTestsUtils.cpp @@ -730,7 +730,7 @@ deUint32 DeviceProperties::computeMaxPerStageDescriptorCount (VkDescriptorType d storageBuffersDynamic = deMinu32( deviceProps.limits.maxPerStageDescriptorStorageBuffers, deviceProps.limits.maxDescriptorSetStorageBuffersDynamic); // 8 sampledImages = deMinu32( deviceProps.limits.maxPerStageDescriptorSampledImages - reservedCount, deviceProps.limits.maxDescriptorSetSampledImages - reservedCount); // 1048576. storageImages = deMinu32( deviceProps.limits.maxPerStageDescriptorStorageImages, deviceProps.limits.maxDescriptorSetStorageImages); // 1048576 - inputAttachments = deMinu32( deviceProps.limits.maxPerStageDescriptorInputAttachments, deviceProps.limits.maxDescriptorSetInputAttachments); // 1048576 + inputAttachments = deMinu32( deviceProps.limits.maxPerStageDescriptorInputAttachments - 1, deviceProps.limits.maxDescriptorSetInputAttachments - 1); // 1048576. -1 because tests use a prime number + 1 to reference subpass input attachment in shader } // adding arbitrary upper bound limits to restrain the size of the test ( we are testing big arrays, not the maximum size arrays )