Merge vk-gl-cts/master into vk-gl-cts/vulkan-cts-next-dev

Change-Id: I8bf1730c57e2fe6c68c03c37ed01c349534801b9

diff --cc external/vulkancts/modules/vulkan/amber/vktAmberTestCase.hpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
index c2ba7e8,1741a0d..5f91777
--- 1/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
--- 2/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
+++ b/external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
@@@ -226,20 -200,21 +200,21 @@@ void DescriptorSetRandomTestCase::check
  
        context.getInstanceInterface().getPhysicalDeviceProperties2(context.getPhysicalDevice(), &properties);
  
-       VkPhysicalDeviceFeatures2 features;
-       VkPhysicalDeviceDescriptorIndexingFeaturesEXT indexingFeatures;
-       VkPhysicalDeviceInlineUniformBlockFeaturesEXT inlineUniformFeatures;
-       getNeededFeatures(context, features, inlineUniformFeatures, indexingFeatures);
+       // Get needed features.
+       auto features                           = context.getDeviceFeatures2();
+       auto indexingFeatures           = context.getDescriptorIndexingFeatures();
 -      auto inlineUniformFeatures      = context.getInlineUniformBlockFeatures();
++      auto inlineUniformFeatures      = context.getInlineUniformBlockFeaturesEXT();
  
+       // Check needed properties and features
        if (m_data.stage == STAGE_VERTEX && !features.features.vertexPipelineStoresAndAtomics)
        {
-               return TCU_THROW(NotSupportedError, "Vertex pipeline stores and atomics not supported");
+               TCU_THROW(NotSupportedError, "Vertex pipeline stores and atomics not supported");
        }
-       else if (m_data.stage == STAGE_RAYGEN &&
-               !context.isDeviceFunctionalitySupported("VK_NV_ray_tracing"))
+       else if (m_data.stage == STAGE_RAYGEN)
        {
-               return TCU_THROW(NotSupportedError, "Ray tracing is not supported");
+               context.requireDeviceFunctionality("VK_NV_ray_tracing");
        }
+ 
        if ((m_data.indexType == INDEX_TYPE_PUSHCONSTANT ||
                 m_data.indexType == INDEX_TYPE_DEPENDENT ||
                 m_data.indexType == INDEX_TYPE_RUNTIME_SIZE) &&
@@@ -845,6 -822,8 +822,7 @@@ tcu::TestStatus DescriptorSetRandomTest
        RandomLayout randomLayout(m_data.numDescriptorSets);
        generateRandomLayout(randomLayout, m_data);
  
 -
+       // Get needed properties.
        VkPhysicalDeviceProperties2 properties;
        deMemset(&properties, 0, sizeof(properties));
        properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2;
@@@ -858,12 -837,12 +836,12 @@@
                properties.pNext = &rayTracingProperties;
        }
  
-       m_context.getInstanceInterface().getPhysicalDeviceProperties2(m_context.getPhysicalDevice(), &properties);
+       vki.getPhysicalDeviceProperties2(physicalDevice, &properties);
  
-       VkPhysicalDeviceFeatures2 features;
-       VkPhysicalDeviceInlineUniformBlockFeaturesEXT inlineUniformFeatures;
-       VkPhysicalDeviceDescriptorIndexingFeaturesEXT indexingFeatures;
-       getNeededFeatures(m_context, features, inlineUniformFeatures, indexingFeatures);
+       // Get needed features.
+       auto descriptorIndexingSupported        = m_context.isDeviceFunctionalitySupported("VK_EXT_descriptor_indexing");
+       auto indexingFeatures                           = m_context.getDescriptorIndexingFeatures();
 -      auto inlineUniformFeatures                      = m_context.getInlineUniformBlockFeatures();
++      auto inlineUniformFeatures                      = m_context.getInlineUniformBlockFeaturesEXT();
  
        deRandom rnd;
        deRandom_init(&rnd, m_data.seed);

diff --cc external/vulkancts/modules/vulkan/image/vktImageMutableTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
Simple merge