Merge vk-gl-cts/vulkan-cts-1.3.2 to vk-gl-cts/vulkan-cts-1.3.3

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / descriptor_indexing / vktDescriptorSetsIndexingTests.cpp

diff --git a/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp b/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
index 4fce063..640ad2b 100644 (file)
--- a/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
+++ b/external/vulkancts/modules/vulkan/descriptor_indexing/vktDescriptorSetsIndexingTests.cpp
@@ -89,7 +89,12 @@ static const VkExtent3D RESOLUTION = { RESOLUTION_width, RESOLUTION_height, 1 };
 
 static const VkExtent3D                        smallImageExtent                                = { 4, 4, 1 };
 static const VkExtent3D                        bigImageExtent                                  = { 32, 32, 1 };
-static const VkDescriptorType  VK_DESCRIPTOR_TYPE_UNDEFINED = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT;
+
+#ifndef CTS_USES_VULKANSC
+static const VkDescriptorType  VK_DESCRIPTOR_TYPE_UNDEFINED    = VK_DESCRIPTOR_TYPE_INLINE_UNIFORM_BLOCK_EXT;
+#else
+static const VkDescriptorType  VK_DESCRIPTOR_TYPE_UNDEFINED    = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
+#endif
 
 template<deUint32 BindingNumber>
 struct Binding
@@ -4090,7 +4095,7 @@ public:
        {
                context.requireDeviceFunctionality("VK_EXT_descriptor_indexing");
 
-               const vk::VkPhysicalDeviceDescriptorIndexingFeaturesEXT& feats = context.getDescriptorIndexingFeatures();
+               const vk::VkPhysicalDeviceDescriptorIndexingFeatures& feats = context.getDescriptorIndexingFeatures();
 
                switch (m_testCaseParams.descriptorType)
                {
@@ -4182,7 +4187,7 @@ public:
 
                std::string(*genShaderSource)(VkShaderStageFlagBits, const TestCaseParams&, bool) = &CommonDescriptorInstance::getShaderAsm;
 
-               deUint32 vulkan_version = VK_MAKE_VERSION(1, 2, 0);
+               deUint32 vulkan_version = VK_MAKE_API_VERSION(0, 1, 2, 0);
                vk::SpirvVersion spirv_version = vk::SPIRV_VERSION_1_4;
                vk::SpirVAsmBuildOptions asm_options(vulkan_version, spirv_version);