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

Change-Id: Ic223266a4266d5c5116db7d87d5519f2209c1a4e

diff --cc AndroidGen.mk
Simple merge

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

diff --cc external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
index 7d37f40,336f115..9c20e4b
--- 1/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
--- 2/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
+++ b/external/vulkancts/framework/vulkan/vkDeviceExtensions.inl
@@@ -47,18 -47,12 +47,19 @@@ 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_timeline_semaphore",
 -      "VK_KHR_shader_clock",
 -      "VK_KHR_spirv_1_4",
        "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_timeline_semaphore",
 +      "VK_KHR_spirv_1_4",
 +      "VK_EXT_separate_stencil_usage",
 +      "VK_KHR_pipeline_executable_properties",
 +      "VK_KHR_shader_clock",
+       "VK_KHR_performance_query",
  };
  

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

diff --cc external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
index 786fbc5,496369a..e7689cb
--- 1/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiDriverPropertiesTests.cpp
@@@ -65,30 -65,24 +65,31 @@@ static const deUint32 knownDriverIds[] 
  
  static const VkConformanceVersionKHR knownConformanceVersions[] =
  {
 -      makeConformanceVersionKHR(1, 1, 6, 2),
 -      makeConformanceVersionKHR(1, 1, 6, 1),
 -      makeConformanceVersionKHR(1, 1, 6, 0),
 -      makeConformanceVersionKHR(1, 1, 5, 2),
 -      makeConformanceVersionKHR(1, 1, 5, 1),
 -      makeConformanceVersionKHR(1, 1, 5, 0),
 -      makeConformanceVersionKHR(1, 1, 4, 3),
 -      makeConformanceVersionKHR(1, 1, 4, 2),
 -      makeConformanceVersionKHR(1, 1, 4, 1),
 -      makeConformanceVersionKHR(1, 1, 4, 0),
 -      makeConformanceVersionKHR(1, 1, 3, 3),
 -      makeConformanceVersionKHR(1, 1, 3, 2),
 -      makeConformanceVersionKHR(1, 1, 3, 1),
 -      makeConformanceVersionKHR(1, 1, 3, 0),
 -      makeConformanceVersionKHR(1, 1, 2, 3),
 -      makeConformanceVersionKHR(1, 1, 2, 2),
 -      makeConformanceVersionKHR(1, 1, 2, 1),
 -      makeConformanceVersionKHR(1, 1, 2, 0),
 +      makeConformanceVersion(1, 2, 0, 2),
 +      makeConformanceVersion(1, 2, 0, 1),
 +      makeConformanceVersion(1, 2, 0, 0),
++      makeConformanceVersion(1, 1, 6, 2),
 +      makeConformanceVersion(1, 1, 6, 1),
 +      makeConformanceVersion(1, 1, 6, 0),
 +      makeConformanceVersion(1, 1, 5, 2),
 +      makeConformanceVersion(1, 1, 5, 1),
 +      makeConformanceVersion(1, 1, 5, 0),
 +      makeConformanceVersion(1, 1, 4, 3),
 +      makeConformanceVersion(1, 1, 4, 2),
 +      makeConformanceVersion(1, 1, 4, 1),
 +      makeConformanceVersion(1, 1, 4, 0),
 +      makeConformanceVersion(1, 1, 3, 3),
 +      makeConformanceVersion(1, 1, 3, 2),
 +      makeConformanceVersion(1, 1, 3, 1),
 +      makeConformanceVersion(1, 1, 3, 0),
 +      makeConformanceVersion(1, 1, 2, 3),
 +      makeConformanceVersion(1, 1, 2, 2),
 +      makeConformanceVersion(1, 1, 2, 1),
 +      makeConformanceVersion(1, 1, 2, 0),
 +      makeConformanceVersion(1, 1, 1, 3),
 +      makeConformanceVersion(1, 1, 1, 2),
 +      makeConformanceVersion(1, 1, 1, 1),
 +      makeConformanceVersion(1, 1, 1, 0),
  };
  
  DE_INLINE bool isNullTerminated(const char* str, const deUint32 maxSize)

diff --cc external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
index 32fb4ef,774d274..bf2afde
--- 1/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
--- 2/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
+++ b/external/vulkancts/modules/vulkan/api/vktApiFeatureInfo.cpp
@@@ -4113,25 -2791,19 +4113,31 @@@ tcu::TestStatus deviceFeatures2 (Contex
        {
                TCU_FAIL("Mismatch between VkPhysicalDeviceConditionalRenderingFeaturesEXT");
        }
+       if ( khr_performance_counter &&
+               (       performanceQueryFeatures[0].performanceCounterQueryPools                        != performanceQueryFeatures[1].performanceCounterQueryPools ||
+                       performanceQueryFeatures[0].performanceCounterMultipleQueryPools        != performanceQueryFeatures[1].performanceCounterMultipleQueryPools ))
+       {
+               TCU_FAIL("Mismatch between VkPhysicalDevicePerformancQueryFeaturesKHR");
+       }
  
 +      if ( ext_scalar_block_layout &&
 +              (       scalarBlockLayoutFeatures[0].scalarBlockLayout != scalarBlockLayoutFeatures[1].scalarBlockLayout ))
 +      {
 +              TCU_FAIL("Mismatch between VkPhysicalDeviceScalarBlockLayoutFeatures");
 +      }
 +
 +      if ( khr_performance_counter &&
 +              (       performanceQueryFeatures[0].performanceCounterQueryPools                        != performanceQueryFeatures[1].performanceCounterQueryPools ||
 +                      performanceQueryFeatures[0].performanceCounterMultipleQueryPools        != performanceQueryFeatures[1].performanceCounterMultipleQueryPools ))
 +      {
 +              TCU_FAIL("Mismatch between VkPhysicalDevicePerformancQueryFeaturesKHR");
 +      }
 +
        if ( khr_16bit_storage &&
 -              (device16BitStorageFeatures[0].storageBuffer16BitAccess                         != device16BitStorageFeatures[1].storageBuffer16BitAccess ||
 -              device16BitStorageFeatures[0].uniformAndStorageBuffer16BitAccess        != device16BitStorageFeatures[1].uniformAndStorageBuffer16BitAccess ||
 -              device16BitStorageFeatures[0].storagePushConstant16                                     != device16BitStorageFeatures[1].storagePushConstant16 ||
 -              device16BitStorageFeatures[0].storageInputOutput16                                      != device16BitStorageFeatures[1].storageInputOutput16)
 -              )
 +              (       device16BitStorageFeatures[0].storageBuffer16BitAccess                          != device16BitStorageFeatures[1].storageBuffer16BitAccess ||
 +                      device16BitStorageFeatures[0].uniformAndStorageBuffer16BitAccess        != device16BitStorageFeatures[1].uniformAndStorageBuffer16BitAccess ||
 +                      device16BitStorageFeatures[0].storagePushConstant16                                     != device16BitStorageFeatures[1].storagePushConstant16 ||
 +                      device16BitStorageFeatures[0].storageInputOutput16                                      != device16BitStorageFeatures[1].storageInputOutput16 ))
        {
                TCU_FAIL("Mismatch between VkPhysicalDevice16BitStorageFeatures");
        }
@@@ -4588,9 -3148,31 +4594,9 @@@ tcu::TestStatus deviceProperties2 (Cont
                    pciBusInfoProperties[0].pciDevice   == DEUINT32_MAX ||
                    pciBusInfoProperties[0].pciFunction == DEUINT32_MAX)
                {
-                   TCU_FAIL("Invalid information in VkPhysicalDevicePCIBusInfoPropertiesEXT");
+                       TCU_FAIL("Invalid information in VkPhysicalDevicePCIBusInfoPropertiesEXT");
                }
        }
 -      if (isExtensionSupported(extensions, RequiredExtension("VK_KHR_performance_query")))
 -      {
 -              VkPhysicalDevicePerformanceQueryPropertiesKHR performanceQueryProperties[count];
 -
 -              for (int ndx = 0; ndx < count; ++ndx)
 -              {
 -                      deMemset(&performanceQueryProperties[ndx], 0xFF * ndx, sizeof(VkPhysicalDevicePerformanceQueryPropertiesKHR));
 -                      performanceQueryProperties[ndx].sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PERFORMANCE_QUERY_PROPERTIES_KHR;
 -                      performanceQueryProperties[ndx].pNext = DE_NULL;
 -
 -                      extProperties.pNext = &performanceQueryProperties[ndx];
 -
 -                      vki.getPhysicalDeviceProperties2(physicalDevice, &extProperties);
 -              }
 -
 -              log << TestLog::Message << performanceQueryProperties[0] << TestLog::EndMessage;
 -
 -              if (performanceQueryProperties[0].allowCommandBufferQueryCopies != performanceQueryProperties[0].allowCommandBufferQueryCopies)
 -              {
 -                      TCU_FAIL("Mismatch between VkPhysicalDevicePerformanceQueryPropertiesKHR");
 -              }
 -      }
  
        return tcu::TestStatus::pass("Querying device properties succeeded");
  }

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

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

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 690cc0e,2a39b49..d638b4b
--- 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,24 -58,18 +58,25 @@@ 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_timeline_semaphore                                     DEVICE 1_2_0
 +VK_KHR_spirv_1_4                                                      DEVICE 1_2_0
 +VK_EXT_separate_stencil_usage                                 DEVICE 1_2_0
  VK_KHR_pipeline_executable_properties                 DEVICE
 -VK_KHR_timeline_semaphore                                     DEVICE
  VK_KHR_shader_clock                                                   DEVICE
 -VK_KHR_spirv_1_4                                                      DEVICE
 -VK_KHR_shader_subgroup_extended_types         DEVICE
 -VK_KHR_separate_depth_stencil_layouts         DEVICE
+ VK_KHR_performance_query                                      DEVICE

diff --cc external/vulkancts/scripts/src/vulkan_core.h
Simple merge