commit 1cfcbe1a777611c4ef588bbd7288834ef149b012
author Alexander Galazin <alexander.galazin@arm.com> Thu Aug 06 20:21:54 2020 +0200
committer Alexander Galazin <alexander.galazin@arm.com> Thu Aug 06 20:21:54 2020 +0200
tree 913890d04b957b49aede38225ddc62c711a52ae1
parent b88256a82c8b5cab2376053928c9a3bb2dd77ab4
parent 4b2f0de4cb4aaba2f6fdd52dd6b8cc94f94da57a

Merge vk-gl-cts/vulkan-cts-1.2.1 into vk-gl-cts/vulkan-cts-1.2.2

Change-Id: Ied950b7f9720bb0d6539fa08a0f0123b68554dd0

external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedAttachmentSparseFillingTests.cpp

diff --git a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedAttachmentSparseFillingTests.cpp b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedAttachmentSparseFillingTests.cpp
index 51cd1f1..24a4227 100644
--- a/external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedAttachmentSparseFillingTests.cpp
+++ b/external/vulkancts/modules/vulkan/renderpass/vktRenderPassUnusedAttachmentSparseFillingTests.cpp
@@ -248,8 +248,8 @@
 
 	const vk::VkPhysicalDeviceLimits limits = getPhysicalDeviceProperties(context.getInstanceInterface(), context.getPhysicalDevice()).limits;
 
-	if( m_testParams.activeInputAttachmentCount > limits.maxPerStageDescriptorInputAttachments )
-		TCU_THROW(NotSupportedError, "Input attachment count exceeds maxPerStageDescriptorInputAttachments");
+	if( 2u * m_testParams.activeInputAttachmentCount > limits.maxPerStageDescriptorInputAttachments )
+		TCU_THROW(NotSupportedError, "Input attachment count including unused elements exceeds maxPerStageDescriptorInputAttachments");
 
 	if ( 2u * m_testParams.activeInputAttachmentCount > limits.maxPerStageResources)
 		TCU_THROW(NotSupportedError, "Input attachment count including unused elements exceeds maxPerStageResources");