From e7a2681e1fbdb5ef876729b193d9ac414661859b Mon Sep 17 00:00:00 2001 From: Mohd Faisal Date: Tue, 19 Mar 2019 14:45:56 +0000 Subject: [PATCH] Fixed dEQP-VK.binding_model.descriptor_copy.* issues. Added missing check for number of maxBoundDescriptorSets allowed, and fixed not copy the same binding in same descriptorSet. Affects: dEQP-VK.binding_model.descriptor_copy.* Components: Vulkan VK-GL-CTS issue: 1664 Change-Id: I69bdb45174c61da3afaa0b323f2598a56d7895c8 --- .../modules/vulkan/binding_model/vktBindingDescriptorCopyTests.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorCopyTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorCopyTests.cpp index 142f80f..332fa80 100644 --- a/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorCopyTests.cpp +++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorCopyTests.cpp @@ -1419,6 +1419,9 @@ tcu::TestStatus DescriptorCommands::run (Context& context) vector attachmentDescriptions; vector imageViews; + if(limits.maxBoundDescriptorSets <= m_descriptorSets.size()) + TCU_THROW(NotSupportedError, "Maximum bound descriptor sets limit exceeded."); + // Check physical device limits of per stage and per desriptor set descriptor count { deUint32 numPerStageSamplers = 0; @@ -2299,7 +2302,7 @@ void addDescriptorCopyTests (tcu::TestContext& testCtx, commands->addDescriptor(DescriptorSp(new T(3u, 0u, 3u, 4u)), 0u); commands->copyDescriptor(0u, 0u, 0u, // from - 0u, 0u, 0u, // to + 0u, 1u, 0u, // to 3u); // num descriptors -- 2.7.4