Merge vk-gl-cts/vulkan-cts-1.3.4 into vk-gl-cts/vulkan-cts-1.3.5

Change-Id: Id88b88271745df8a24fab873df096dc92c81988a

diff --git a/external/vulkancts/modules/vulkan/binding_model/vktBindingMutableTests.cpp b/external/vulkancts/modules/vulkan/binding_model/vktBindingMutableTests.cpp
index 330f330..5449b6a 100644 (file)
--- a/external/vulkancts/modules/vulkan/binding_model/vktBindingMutableTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingMutableTests.cpp
@@ -4064,13 +4064,14 @@ void createChildren (tcu::TestCaseGroup* mainGroup)
                                DescriptorSet::BindingPtrVector setBindings;
                                std::vector<SingleBinding> arrayBindings;
 
-                               // Single mutable descriptor as the first binding.
-                               setBindings.emplace_back(new SingleBinding(VK_DESCRIPTOR_TYPE_MUTABLE_EXT, mandatoryTypes));
-
-                               // Descriptor array as the second binding.
+                               // Add single type beyond the mandatory ones.
                                auto arrayBindingDescTypes = mandatoryTypes;
                                arrayBindingDescTypes.push_back(descriptorType);
 
+                               // Single mutable descriptor as the first binding.
+                               setBindings.emplace_back(new SingleBinding(VK_DESCRIPTOR_TYPE_MUTABLE_EXT, arrayBindingDescTypes));
+
+                               // Descriptor array as the second binding.
                                if (aliasingCase.aliasing)
                                {
                                        // With aliasing, the descriptor types rotate in each descriptor.

diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineDescriptorLimitsTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineDescriptorLimitsTests.cpp
index c76640f..638d108 100644 (file)
--- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineDescriptorLimitsTests.cpp
+++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineDescriptorLimitsTests.cpp
@@ -768,7 +768,7 @@ void DescriptorLimitTest::initPrograms (SourceCollections& sourceCollections) co
 
        if (m_testType == TestType::InputAttachments)
        {
-               testTypeStr << "layout (input_attachment_index = 0, set = 0, binding = " << m_descCount - 1u << ") uniform subpassInput imageInput;\n";
+               testTypeStr << "layout (input_attachment_index = 1, set = 0, binding = " << m_descCount - 1u << ") uniform subpassInput imageInput;\n";
 
                fragResultStr   << "    fragColor = subpassLoad(imageInput);\n";
                compResultStr   << "    outputData.color = vec4(0.0, 0.0, 0.0, 1.0);\n";