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

Change-Id: I5c227fb62141046cb6d2a8f1956b2c4a60d67abb

diff --cc AndroidGen.mk
Simple merge

diff --cc android/cts/master/vk-master.txt
Simple merge

diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
index 97ab5bf,f6ad440..d20f4c6
--- 1/external/vulkancts/framework/vulkan/vkBasicTypes.inl
--- 2/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@@ -259,7 -259,9 +259,10 @@@ enum VkStructureTyp
        VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR                                                                  = 1000079000,
        VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR                                                                             = 1000079001,
        VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR                                = 1000080000,
+       VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT             = 1000081000,
+       VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT                    = 1000081001,
+       VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT                                                  = 1000081002,
 +      VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR                                             = 1000082000,
        VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR                                                                                   = 1000084000,
        VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX                                                                  = 1000086000,
        VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX                                              = 1000086001,

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

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

diff --cc external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
index cddf194,c41ce1c..49eae9d
--- 1/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
--- 2/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
+++ b/external/vulkancts/framework/vulkan/vkStrUtilImpl.inl
@@@ -268,7 -268,9 +268,10 @@@ const char* getStructureTypeName (VkStr
                case VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR:                                                                    return "VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR";
                case VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR:                                                                               return "VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR";
                case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR:                                  return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR";
+               case VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT:               return "VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT";
+               case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT:                              return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT";
+               case VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT:                                                    return "VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT";
 +              case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR:                                               return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR";
                case VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR:                                                                                             return "VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR";
                case VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX:                                                                    return "VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX";
                case VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX:                                                return "VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX";

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

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

diff --cc external/vulkancts/modules/vulkan/renderpass/CMakeLists.txt
Simple merge

diff --cc external/vulkancts/modules/vulkan/spirv_assembly/CMakeLists.txt
Simple merge

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

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

diff --cc external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
Simple merge

diff --cc external/vulkancts/mustpass/1.1.3/vk-default.txt
Simple merge

diff --cc external/vulkancts/scripts/src/vulkan.h.in
index 371fe97,e14264d..dbd1e49
--- 1/external/vulkancts/scripts/src/vulkan.h.in
--- 2/external/vulkancts/scripts/src/vulkan.h.in
+++ b/external/vulkancts/scripts/src/vulkan.h.in
@@@ -316,7 -316,9 +316,10 @@@ typedef enum VkStructureType 
      VK_STRUCTURE_TYPE_IMPORT_SEMAPHORE_FD_INFO_KHR = 1000079000,
      VK_STRUCTURE_TYPE_SEMAPHORE_GET_FD_INFO_KHR = 1000079001,
      VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR = 1000080000,
+     VK_STRUCTURE_TYPE_COMMAND_BUFFER_INHERITANCE_CONDITIONAL_RENDERING_INFO_EXT = 1000081000,
+     VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CONDITIONAL_RENDERING_FEATURES_EXT = 1000081001,
+     VK_STRUCTURE_TYPE_CONDITIONAL_RENDERING_BEGIN_INFO_EXT = 1000081002,
 +    VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT16_INT8_FEATURES_KHR = 1000082000,
      VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR = 1000084000,
      VK_STRUCTURE_TYPE_OBJECT_TABLE_CREATE_INFO_NVX = 1000086000,
      VK_STRUCTURE_TYPE_INDIRECT_COMMANDS_LAYOUT_CREATE_INFO_NVX = 1000086001,