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

Change-Id: I8e4fb16c3f82b6cc42af849e201d50ad2f053d6e

diff --cc external/openglcts/modules/gl/gl3cCullDistanceTests.cpp
Simple merge

diff --cc external/openglcts/modules/gl/gl4cPipelineStatisticsQueryTests.cpp
Simple merge

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

diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
index e10355a,64fadd6..d8bfe97
--- 1/external/vulkancts/framework/vulkan/vkBasicTypes.inl
--- 2/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@@ -1,19 -1,20 +1,20 @@@
  /* 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
   */
 -#define VK_API_VERSION_1_0                                    (static_cast<deUint32>                  (VK_MAKE_VERSION(1, 0, 0)))
 -#define VK_API_VERSION_1_1                                    (static_cast<deUint32>                  (VK_MAKE_VERSION(1, 1, 0)))
 -#define VK_API_VERSION_1_2                                    (static_cast<deUint32>                  (VK_MAKE_VERSION(1, 2, 0)))
 -#define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE      (static_cast<size_t>                    (256))
 -#define VK_MAX_EXTENSION_NAME_SIZE                    (static_cast<size_t>                    (256))
 -#define VK_MAX_DRIVER_NAME_SIZE                               (static_cast<size_t>                    (256))
 -#define VK_MAX_DRIVER_INFO_SIZE                               (static_cast<size_t>                    (256))
 -#define VK_UUID_SIZE                                          (static_cast<size_t>                    (16))
 -#define VK_LUID_SIZE                                          (static_cast<size_t>                    (8))
 -#define VK_MAX_MEMORY_TYPES                                   (static_cast<size_t>                    (32))
 -#define VK_MAX_MEMORY_HEAPS                                   (static_cast<size_t>                    (16))
 -#define VK_MAX_DESCRIPTION_SIZE                               (static_cast<size_t>                    (256))
 -#define VK_MAX_DEVICE_GROUP_SIZE                      (static_cast<size_t>                    (32))
 +#define VK_API_VERSION_1_0                                    (static_cast<deUint32>                  (VK_MAKE_API_VERSION(0, 1, 0, 0)))
 +#define VK_API_VERSION_1_1                                    (static_cast<deUint32>                  (VK_MAKE_API_VERSION(0, 1, 1, 0)))
 +#define VK_API_VERSION_1_2                                    (static_cast<deUint32>                  (VK_MAKE_API_VERSION(0, 1, 2, 0)))
 +#define VK_MAX_PHYSICAL_DEVICE_NAME_SIZE      (static_cast<size_t>                    (256U))
 +#define VK_MAX_EXTENSION_NAME_SIZE                    (static_cast<size_t>                    (256U))
 +#define VK_MAX_DRIVER_NAME_SIZE                               (static_cast<size_t>                    (256U))
 +#define VK_MAX_DRIVER_INFO_SIZE                               (static_cast<size_t>                    (256U))
 +#define VK_UUID_SIZE                                          (static_cast<size_t>                    (16U))
 +#define VK_LUID_SIZE                                          (static_cast<size_t>                    (8U))
 +#define VK_MAX_MEMORY_TYPES                                   (static_cast<size_t>                    (32U))
 +#define VK_MAX_MEMORY_HEAPS                                   (static_cast<size_t>                    (16U))
 +#define VK_MAX_DESCRIPTION_SIZE                               (static_cast<size_t>                    (256U))
 +#define VK_MAX_DEVICE_GROUP_SIZE                      (static_cast<size_t>                    (32U))
  #define VK_ATTACHMENT_UNUSED                          (static_cast<deUint32>                  ((~0U)))
  #define VK_SUBPASS_EXTERNAL                                   (static_cast<deUint32>                  ((~0U)))
  #define VK_QUEUE_FAMILY_IGNORED                               (static_cast<deUint32>                  ((~0U)))

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/vkDeviceFeatures2.inl
index 1fdba9d,b5a73da..337cee1
--- 1/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl
--- 2/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceFeatures2.inl
@@@ -58,61 -57,57 +59,61 @@@ for (int ndx = 0; ndx < count; ++ndx
        deMemset(&deviceTimelineSemaphoreFeatures[ndx],                 0xFF * ndx, sizeof(VkPhysicalDeviceTimelineSemaphoreFeatures));
        deMemset(&deviceFragmentDensityMapFeaturesEXT[ndx],             0xFF * ndx, sizeof(VkPhysicalDeviceFragmentDensityMapFeaturesEXT));
        deMemset(&deviceFragmentDensityMap2FeaturesEXT[ndx],    0xFF * ndx, sizeof(VkPhysicalDeviceFragmentDensityMap2FeaturesEXT));
 +      deMemset(&deviceShaderIntegerDotProductFeaturesKHR[ndx],0xFF * ndx, sizeof(VkPhysicalDeviceShaderIntegerDotProductFeaturesKHR));
  
-       deviceConditionalRenderingFeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT;
+       deviceConditionalRenderingFeaturesEXT[ndx].sType = isConditionalRenderingFeaturesEXT ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceConditionalRenderingFeaturesEXT[ndx].pNext = &deviceScalarBlockLayoutFeatures[ndx];
  
-       deviceScalarBlockLayoutFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES;
+       deviceScalarBlockLayoutFeatures[ndx].sType = isScalarBlockLayoutFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SCALAR_BLOCK_LAYOUT_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceScalarBlockLayoutFeatures[ndx].pNext = &devicePerformanceQueryFeaturesKHR[ndx];
  
-       devicePerformanceQueryFeaturesKHR[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR;
+       devicePerformanceQueryFeaturesKHR[ndx].sType = isPerformanceQueryFeaturesKHR ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_FEATURES_KHR : VK_STRUCTURE_TYPE_MAX_ENUM;
        devicePerformanceQueryFeaturesKHR[ndx].pNext = &device16BitStorageFeatures[ndx];
  
-       device16BitStorageFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES;
+       device16BitStorageFeatures[ndx].sType = is16BitStorageFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_16BIT_STORAGE_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        device16BitStorageFeatures[ndx].pNext = &deviceMultiviewFeatures[ndx];
  
-       deviceMultiviewFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES;
+       deviceMultiviewFeatures[ndx].sType = isMultiviewFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MULTIVIEW_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceMultiviewFeatures[ndx].pNext = &deviceProtectedMemoryFeatures[ndx];
  
-       deviceProtectedMemoryFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES;
+       deviceProtectedMemoryFeatures[ndx].sType = isProtectedMemoryFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROTECTED_MEMORY_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceProtectedMemoryFeatures[ndx].pNext = &deviceSamplerYcbcrConversionFeatures[ndx];
  
-       deviceSamplerYcbcrConversionFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES;
+       deviceSamplerYcbcrConversionFeatures[ndx].sType = isSamplerYcbcrConversionFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceSamplerYcbcrConversionFeatures[ndx].pNext = &deviceVariablePointersFeatures[ndx];
  
-       deviceVariablePointersFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES;
+       deviceVariablePointersFeatures[ndx].sType = isVariablePointersFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VARIABLE_POINTERS_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceVariablePointersFeatures[ndx].pNext = &device8BitStorageFeatures[ndx];
  
-       device8BitStorageFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES;
+       device8BitStorageFeatures[ndx].sType = is8BitStorageFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_8BIT_STORAGE_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        device8BitStorageFeatures[ndx].pNext = &deviceShaderAtomicInt64Features[ndx];
  
-       deviceShaderAtomicInt64Features[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES;
+       deviceShaderAtomicInt64Features[ndx].sType = isShaderAtomicInt64Features ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_ATOMIC_INT64_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceShaderAtomicInt64Features[ndx].pNext = &deviceShaderFloat16Int8Features[ndx];
  
-       deviceShaderFloat16Int8Features[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES;
+       deviceShaderFloat16Int8Features[ndx].sType = isShaderFloat16Int8Features ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_FLOAT16_INT8_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceShaderFloat16Int8Features[ndx].pNext = &deviceBufferDeviceAddressFeaturesEXT[ndx];
  
-       deviceBufferDeviceAddressFeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT;
+       deviceBufferDeviceAddressFeaturesEXT[ndx].sType = isBufferDeviceAddressFeaturesEXT ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES_EXT : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceBufferDeviceAddressFeaturesEXT[ndx].pNext = &deviceBufferDeviceAddressFeatures[ndx];
  
-       deviceBufferDeviceAddressFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES;
+       deviceBufferDeviceAddressFeatures[ndx].sType = isBufferDeviceAddressFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BUFFER_DEVICE_ADDRESS_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceBufferDeviceAddressFeatures[ndx].pNext = &deviceDescriptorIndexingFeatures[ndx];
  
-       deviceDescriptorIndexingFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES;
+       deviceDescriptorIndexingFeatures[ndx].sType = isDescriptorIndexingFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceDescriptorIndexingFeatures[ndx].pNext = &deviceTimelineSemaphoreFeatures[ndx];
  
-       deviceTimelineSemaphoreFeatures[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES;
+       deviceTimelineSemaphoreFeatures[ndx].sType = isTimelineSemaphoreFeatures ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceTimelineSemaphoreFeatures[ndx].pNext = &deviceFragmentDensityMapFeaturesEXT[ndx];
  
-       deviceFragmentDensityMapFeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT;
+       deviceFragmentDensityMapFeaturesEXT[ndx].sType = isFragmentDensityMapFeaturesEXT ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_FEATURES_EXT : VK_STRUCTURE_TYPE_MAX_ENUM;
        deviceFragmentDensityMapFeaturesEXT[ndx].pNext = &deviceFragmentDensityMap2FeaturesEXT[ndx];
  
-       deviceFragmentDensityMap2FeaturesEXT[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT;
+       deviceFragmentDensityMap2FeaturesEXT[ndx].sType = isFragmentDensityMap2FeaturesEXT ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_2_FEATURES_EXT : VK_STRUCTURE_TYPE_MAX_ENUM;
 -      deviceFragmentDensityMap2FeaturesEXT[ndx].pNext = DE_NULL;
 +      deviceFragmentDensityMap2FeaturesEXT[ndx].pNext = &deviceShaderIntegerDotProductFeaturesKHR[ndx];
 +
-       deviceShaderIntegerDotProductFeaturesKHR[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR;
++      deviceShaderIntegerDotProductFeaturesKHR[ndx].sType = isShaderIntegerDotProductFeaturesKHR ? VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_INTEGER_DOT_PRODUCT_FEATURES_KHR : VK_STRUCTURE_TYPE_MAX_ENUM;
 +      deviceShaderIntegerDotProductFeaturesKHR[ndx].pNext = DE_NULL;
  
        deMemset(&extFeatures.features, 0xcd, sizeof(extFeatures.features));
        extFeatures.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;

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
Simple merge

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

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

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/vkKnownDriverIds.inl
Simple merge

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

diff --cc external/vulkancts/framework/vulkan/vkNullDriver.cpp
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/protected_memory/vktProtectedMemYCbCrConversionTests.cpp
Simple merge

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

diff --cc external/vulkancts/modules/vulkan/robustness/vktRobustBufferAccessWithVariablePointersTests.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/shaderexecutor/vktShaderExecutor.cpp
Simple merge

diff --cc external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderBuiltinVarTests.cpp
Simple merge

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/wsi/vktWsiSwapchainTests.cpp
Simple merge

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

diff --cc framework/opengl/simplereference/sglrReferenceContext.cpp
Simple merge

diff --cc modules/egl/teglRobustnessTests.cpp
Simple merge

diff --cc modules/gles3/functional/es3fNegativeTextureApiTests.cpp
Simple merge

diff --cc modules/gles31/functional/es31fNegativeShaderApiTests.cpp
Simple merge

diff --cc modules/gles31/functional/es31fNegativeStateApiTests.cpp
Simple merge

diff --cc modules/gles31/functional/es31fProgramInterfaceDefinitionUtil.cpp
Simple merge

diff --cc modules/gles31/functional/es31fProgramInterfaceQueryTestCase.cpp
Simple merge

diff --cc modules/gles31/functional/es31fProgramInterfaceQueryTests.cpp
Simple merge

diff --cc modules/gles31/functional/es31fSynchronizationTests.cpp
Simple merge

diff --cc modules/gles31/tes31Context.cpp
Simple merge

diff --cc modules/glshared/glsBuiltinPrecisionTests.cpp
Simple merge

diff --cc modules/glshared/glsDrawTest.cpp
Simple merge

diff --cc modules/glshared/glsShaderExecUtil.cpp
Simple merge