Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5

Change-Id: I85eab03afdf24359556917617b56856b51b7eb07

diff --cc external/openglcts/modules/runner/glcTestRunner.cpp
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkConcreteDeviceInterface.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkConcreteInstanceInterface.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceDriverImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeatures.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDecl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeaturesForContextDefs.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceFeaturesForDefaultDeviceDefs.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceFunctionPointers.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDeviceProperties.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl
index e3747f4,4e547fa..def2bdd
--- 1/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl
--- 2/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl
+++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDecl.inl
@@@ -1,7 -1,7 +1,8 @@@
  /* WARNING: This is auto-generated file. Do not modify, since changes will
   * be lost! Modify the generating script instead.
+  * This file was generated by /scripts/gen_framework.py
   */
 +const vk::VkPhysicalDeviceAccelerationStructurePropertiesKHR&         getAccelerationStructureProperties                      (void) const;
  const vk::VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT&                getBlendOperationAdvancedPropertiesEXT          (void) const;
  const vk::VkPhysicalDeviceConservativeRasterizationPropertiesEXT&     getConservativeRasterizationPropertiesEXT       (void) const;
  const vk::VkPhysicalDeviceCooperativeMatrixPropertiesNV&                      getCooperativeMatrixProperties                          (void) const;

diff --cc external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl
index c4f31d3,53b333f..836e343
--- 1/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl
--- 2/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl
+++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForContextDefs.inl
@@@ -1,7 -1,7 +1,8 @@@
  /* WARNING: This is auto-generated file. Do not modify, since changes will
   * be lost! Modify the generating script instead.
+  * This file was generated by /scripts/gen_framework.py
   */
 +const vk::VkPhysicalDeviceAccelerationStructurePropertiesKHR&         Context::getAccelerationStructureProperties                     (void) const { return m_device->getAccelerationStructureProperties();                   }
  const vk::VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT&                Context::getBlendOperationAdvancedPropertiesEXT         (void) const { return m_device->getBlendOperationAdvancedPropertiesEXT();               }
  const vk::VkPhysicalDeviceConservativeRasterizationPropertiesEXT&     Context::getConservativeRasterizationPropertiesEXT      (void) const { return m_device->getConservativeRasterizationPropertiesEXT();    }
  const vk::VkPhysicalDeviceCooperativeMatrixPropertiesNV&                      Context::getCooperativeMatrixProperties                         (void) const { return m_device->getCooperativeMatrixProperties();                               }

diff --cc external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl
index a0bfa0c,9b0d043..d752a84
--- 1/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl
--- 2/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl
+++ b/external/vulkancts/framework/vulkan/vkDevicePropertiesForDefaultDeviceDefs.inl
@@@ -1,7 -1,7 +1,8 @@@
  /* WARNING: This is auto-generated file. Do not modify, since changes will
   * be lost! Modify the generating script instead.
+  * This file was generated by /scripts/gen_framework.py
   */
 +const VkPhysicalDeviceAccelerationStructurePropertiesKHR&             getAccelerationStructureProperties                      (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceAccelerationStructurePropertiesKHR>();                 }
  const VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT&            getBlendOperationAdvancedPropertiesEXT          (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT>();                }
  const VkPhysicalDeviceConservativeRasterizationPropertiesEXT& getConservativeRasterizationPropertiesEXT       (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceConservativeRasterizationPropertiesEXT>();             }
  const VkPhysicalDeviceCooperativeMatrixPropertiesNV&                  getCooperativeMatrixProperties                          (void) const { return m_deviceProperties.getPropertyType<VkPhysicalDeviceCooperativeMatrixPropertiesNV>();                              }

diff --cc external/vulkancts/framework/vulkan/vkExtensionFunctions.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkFunctionPointerTypes.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkGetStructureTypeImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkHandleType.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkInitDeviceFunctionPointers.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkInitInstanceFunctionPointers.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkInstanceDriverImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkInstanceFunctionPointers.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkMandatoryFeatures.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkNullDriverImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkObjTypeImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkRefUtil.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkRefUtilImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkStrUtil.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkStructTypes.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkTypeUtil.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkVirtualDeviceInterface.inl
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkVirtualInstanceInterface.inl
Simple merge

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

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

diff --cc external/vulkancts/modules/vulkan/binding_model/vktBindingDescriptorSetRandomTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/memory/vktMemoryAllocationTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/multiview/vktMultiViewRenderTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelinePushConstantTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/pipeline/vktPipelineTimestampTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/renderpass/vktRenderPassFragmentDensityMapTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp
index 291ba37,c346051..0982ac8
--- 1/external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp
--- 2/external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp
+++ b/external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp
@@@ -815,9 -810,8 +815,9 @@@ public
  };
  
  // A routing generating SPIRV code for all test cases in this group
- std::string MakeShader(VkShaderStageFlags shaderStage, ShaderType shaderType, VkFormat bufferFormat, bool reads, bool dummy)
+ std::string MakeShader(VkShaderStageFlags shaderStage, ShaderType shaderType, VkFormat bufferFormat, bool reads, bool unused)
  {
 +      const bool                                      isR64                           = (bufferFormat == VK_FORMAT_R64_UINT || bufferFormat == VK_FORMAT_R64_SINT);
        // faster to write
        const char                                      is                                      = '=';
  

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

diff --cc external/vulkancts/modules/vulkan/synchronization/vktSynchronizationSignalOrderTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/util/vktDrawUtil.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/wsi/vktWsiSwapchainTests.cpp
Simple merge

diff --cc external/vulkancts/scripts/gen_framework.py
Simple merge