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

Change-Id: I2e4d3f45883c5f694e8d4f3a5176864c62394bba

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

diff --cc external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
index f262913,56698b0..c805926
--- 1/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
--- 2/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
@@@ -47,7 -47,13 +47,14 @@@ static const char* s_allowedDeviceKhrEx
        "VK_KHR_vulkan_memory_model",
        "VK_KHR_uniform_buffer_standard_layout",
        "VK_KHR_imageless_framebuffer",
-       "VK_KHR_pipeline_executable_properties",
+       "VK_KHR_shader_subgroup_extended_types",
+       "VK_EXT_sampler_filter_minmax",
+       "VK_EXT_shader_viewport_index_layer",
+       "VK_EXT_descriptor_indexing",
+       "VK_EXT_scalar_block_layout",
+       "VK_KHR_buffer_device_address",
+       "VK_EXT_host_query_reset",
        "VK_KHR_separate_depth_stencil_layouts",
++      "VK_KHR_pipeline_executable_properties",
  };
  

diff --cc external/vulkancts/framework/vulkan/vkVulkan_c.inl
index ab29ad1,4e0aa8c..07951bd
--- 1/external/vulkancts/framework/vulkan/vkVulkan_c.inl
--- 2/external/vulkancts/framework/vulkan/vkVulkan_c.inl
+++ b/external/vulkancts/framework/vulkan/vkVulkan_c.inl
@@@ -6647,8 -7364,7 +7364,6 @@@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPip
      VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations);
  #endif
  
- 
--
  #define VK_EXT_debug_report 1
  VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)
  #define VK_EXT_DEBUG_REPORT_SPEC_VERSION  9

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

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

diff --cc external/vulkancts/scripts/src/extensions_data.txt
index 15c1135,a486d0e..5eec9dd
--- 1/external/vulkancts/scripts/src/extensions_data.txt
--- 2/external/vulkancts/scripts/src/extensions_data.txt
+++ b/external/vulkancts/scripts/src/extensions_data.txt
@@@ -58,13 -58,19 +58,20 @@@ VK_KHR_image_format_list                                   DEVICE 1_2
  VK_KHR_sampler_ycbcr_conversion                               DEVICE 1_1_0
  VK_KHR_bind_memory2                                                   DEVICE 1_1_0
  VK_KHR_maintenance3                                                   DEVICE 1_1_0
- VK_KHR_driver_properties                                      DEVICE
- VK_KHR_shader_float_controls                          DEVICE
- VK_KHR_depth_stencil_resolve                          DEVICE
- VK_KHR_draw_indirect_count                                    DEVICE
- VK_KHR_shader_atomic_int64                                    DEVICE
- VK_KHR_vulkan_memory_model                                    DEVICE
- VK_KHR_uniform_buffer_standard_layout         DEVICE
- VK_KHR_imageless_framebuffer                          DEVICE
+ VK_KHR_driver_properties                                      DEVICE 1_2_0
+ VK_KHR_shader_float_controls                          DEVICE 1_2_0
+ VK_KHR_depth_stencil_resolve                          DEVICE 1_2_0
+ VK_KHR_draw_indirect_count                                    DEVICE 1_2_0
+ VK_KHR_shader_atomic_int64                                    DEVICE 1_2_0
+ VK_KHR_vulkan_memory_model                                    DEVICE 1_2_0
+ VK_KHR_uniform_buffer_standard_layout         DEVICE 1_2_0
+ VK_KHR_imageless_framebuffer                          DEVICE 1_2_0
+ VK_KHR_shader_subgroup_extended_types         DEVICE 1_2_0
+ VK_EXT_sampler_filter_minmax                          DEVICE 1_2_0
+ VK_EXT_shader_viewport_index_layer                    DEVICE 1_2_0
+ VK_EXT_descriptor_indexing                                    DEVICE 1_2_0
+ VK_EXT_scalar_block_layout                                    DEVICE 1_2_0
+ VK_KHR_buffer_device_address                          DEVICE 1_2_0
+ VK_EXT_host_query_reset                                               DEVICE 1_2_0
+ VK_KHR_separate_depth_stencil_layouts         DEVICE 1_2_0
 +VK_KHR_pipeline_executable_properties                 DEVICE
- VK_KHR_separate_depth_stencil_layouts         DEVICE

diff --cc external/vulkancts/scripts/src/vulkan_core.h
index 90160f3,dd25ff2..09a796f
--- 1/external/vulkancts/scripts/src/vulkan_core.h
--- 2/external/vulkancts/scripts/src/vulkan_core.h
+++ b/external/vulkancts/scripts/src/vulkan_core.h
@@@ -6644,8 -7361,7 +7361,6 @@@ VKAPI_ATTR VkResult VKAPI_CALL vkGetPip
      VkPipelineExecutableInternalRepresentationKHR* pInternalRepresentations);
  #endif
  
- 
--
  #define VK_EXT_debug_report 1
  VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkDebugReportCallbackEXT)
  #define VK_EXT_DEBUG_REPORT_SPEC_VERSION  9