Merge vk-gl-cts/vulkan-cts-1.2.7 into vk-gl-cts/vulkan-cts-1.2.8

Change-Id: Ic672c22814f2196db26725b7b2794629bbe130b6

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

diff --cc external/vulkancts/framework/vulkan/vkBasicTypes.inl
index e64e53a,376b4f3..c3e9fcf
--- 1/external/vulkancts/framework/vulkan/vkBasicTypes.inl
--- 2/external/vulkancts/framework/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/vkBasicTypes.inl
@@@ -3974,66 -3969,29 +3977,66 @@@ static const VkAccessFlagBits2KHR VK_AC
  static const VkAccessFlagBits2KHR VK_ACCESS_2_COLOR_ATTACHMENT_READ_NONCOHERENT_BIT_EXT               = 0x00080000ULL;
  static const VkAccessFlagBits2KHR VK_ACCESS_2_INVOCATION_MASK_READ_BIT_HUAWEI                         = 0x8000000000ULL;
  
 -VK_DEFINE_PLATFORM_TYPE(XlibDisplayPtr,                               void*);
 -VK_DEFINE_PLATFORM_TYPE(XlibWindow,                                   deUintptr);
 -VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                         deUint32);
 -VK_DEFINE_PLATFORM_TYPE(XcbConnectionPtr,                     void*);
 -VK_DEFINE_PLATFORM_TYPE(XcbWindow,                                    deUintptr);
 -VK_DEFINE_PLATFORM_TYPE(XcbVisualid,                          deUint32);
 -VK_DEFINE_PLATFORM_TYPE(WaylandDisplayPtr,                    void*);
 -VK_DEFINE_PLATFORM_TYPE(WaylandSurfacePtr,                    void*);
 -VK_DEFINE_PLATFORM_TYPE(MirConnectionPtr,                     void*);
 -VK_DEFINE_PLATFORM_TYPE(MirSurfacePtr,                                void*);
 -VK_DEFINE_PLATFORM_TYPE(AndroidNativeWindowPtr,               void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32InstanceHandle,          void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32WindowHandle,                    void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32Handle,                          void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32SecurityAttributesPtr,   const void*);
 -VK_DEFINE_PLATFORM_TYPE(AndroidHardwareBufferPtr,     void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32MonitorHandle,                   void*);
 -VK_DEFINE_PLATFORM_TYPE(Win32LPCWSTR,                         const void*);
 -VK_DEFINE_PLATFORM_TYPE(RROutput,                                     void*);
 -VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                          deUint32);
 -VK_DEFINE_PLATFORM_TYPE(GgpFrameToken,                                deInt32);
 -VK_DEFINE_PLATFORM_TYPE(GgpStreamDescriptor,          deInt32);
 -VK_DEFINE_PLATFORM_TYPE(CAMetalLayer,                         void*);
 +typedef uint64_t VkFormatFeatureFlags2KHR;
 +typedef uint64_t VkFormatFeatureFlagBits2KHR;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_BIT_KHR                                                                                                                            = 0x00000001ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_IMAGE_BIT_KHR                                                                                                                            = 0x00000002ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_IMAGE_ATOMIC_BIT_KHR                                                                                                             = 0x00000004ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_UNIFORM_TEXEL_BUFFER_BIT_KHR                                                                                                             = 0x00000008ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_BIT_KHR                                                                                                             = 0x00000010ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_TEXEL_BUFFER_ATOMIC_BIT_KHR                                                                                              = 0x00000020ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VERTEX_BUFFER_BIT_KHR                                                                                                                            = 0x00000040ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BIT_KHR                                                                                                                 = 0x00000080ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_COLOR_ATTACHMENT_BLEND_BIT_KHR                                                                                                           = 0x00000100ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_DEPTH_STENCIL_ATTACHMENT_BIT_KHR                                                                                                 = 0x00000200ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_BLIT_SRC_BIT_KHR                                                                                                                                 = 0x00000400ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_BLIT_DST_BIT_KHR                                                                                                                                 = 0x00000800ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_LINEAR_BIT_KHR                                                                                              = 0x00001000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_CUBIC_BIT_IMG                                                                                                       = 0x00002000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_TRANSFER_SRC_BIT_KHR                                                                                                                             = 0x00004000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_TRANSFER_DST_BIT_KHR                                                                                                                             = 0x00008000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_FILTER_MINMAX_BIT_KHR                                                                                              = 0x00010000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_MIDPOINT_CHROMA_SAMPLES_BIT_KHR                                                                                                  = 0x00020000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_LINEAR_FILTER_BIT_KHR                                                             = 0x00040000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_SEPARATE_RECONSTRUCTION_FILTER_BIT_KHR                            = 0x00080000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_BIT_KHR                            = 0x00100000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_YCBCR_CONVERSION_CHROMA_RECONSTRUCTION_EXPLICIT_FORCEABLE_BIT_KHR  = 0x00200000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_DISJOINT_BIT_KHR                                                                                                                                 = 0x00400000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_COSITED_CHROMA_SAMPLES_BIT_KHR                                                                                                           = 0x00800000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_FRAGMENT_DENSITY_MAP_BIT_EXT                                                                                                             = 0x01000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VIDEO_DECODE_OUTPUT_BIT_KHR                                                                                                              = 0x02000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VIDEO_DECODE_DPB_BIT_KHR                                                                                                                 = 0x04000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VIDEO_ENCODE_INPUT_BIT_KHR                                                                                                                       = 0x08000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_VIDEO_ENCODE_DPB_BIT_KHR                                                                                                                 = 0x10000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_ACCELERATION_STRUCTURE_VERTEX_BUFFER_BIT_KHR                                                                             = 0x20000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_FRAGMENT_SHADING_RATE_ATTACHMENT_BIT_KHR                                                                                 = 0x40000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_READ_WITHOUT_FORMAT_BIT_KHR                                                                                              = 0x80000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_STORAGE_WRITE_WITHOUT_FORMAT_BIT_KHR                                                                                             = 0x100000000ULL;
 +static const VkFormatFeatureFlagBits2KHR VK_FORMAT_FEATURE_2_SAMPLED_IMAGE_DEPTH_COMPARISON_BIT_KHR                                                                                           = 0x200000000ULL;
 +
 +VK_DEFINE_PLATFORM_TYPE(XlibDisplayPtr,                               void*)
 +VK_DEFINE_PLATFORM_TYPE(XlibWindow,                                   uintptr_t)
 +VK_DEFINE_PLATFORM_TYPE(XlibVisualID,                         uint32_t)
 +VK_DEFINE_PLATFORM_TYPE(XcbConnectionPtr,                     void*)
 +VK_DEFINE_PLATFORM_TYPE(XcbWindow,                                    uintptr_t)
 +VK_DEFINE_PLATFORM_TYPE(XcbVisualid,                          uint32_t)
 +VK_DEFINE_PLATFORM_TYPE(WaylandDisplayPtr,                    void*)
 +VK_DEFINE_PLATFORM_TYPE(WaylandSurfacePtr,                    void*)
 +VK_DEFINE_PLATFORM_TYPE(MirConnectionPtr,                     void*)
 +VK_DEFINE_PLATFORM_TYPE(MirSurfacePtr,                                void*)
 +VK_DEFINE_PLATFORM_TYPE(AndroidNativeWindowPtr,               void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32InstanceHandle,          void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32WindowHandle,                    void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32Handle,                          void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32SecurityAttributesPtr,   const void*)
 +VK_DEFINE_PLATFORM_TYPE(AndroidHardwareBufferPtr,     void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32MonitorHandle,                   void*)
 +VK_DEFINE_PLATFORM_TYPE(Win32LPCWSTR,                         const void*)
 +VK_DEFINE_PLATFORM_TYPE(RROutput,                                     void*)
- VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                          int32_t)
++VK_DEFINE_PLATFORM_TYPE(zx_handle_t,                          uint32_t)
 +VK_DEFINE_PLATFORM_TYPE(GgpFrameToken,                                int32_t)
 +VK_DEFINE_PLATFORM_TYPE(GgpStreamDescriptor,          int32_t)
 +VK_DEFINE_PLATFORM_TYPE(CAMetalLayer,                         void*)
  #define VK_KHR_SURFACE_SPEC_VERSION 25
  #define VK_KHR_SWAPCHAIN_SPEC_VERSION 70
  #define VK_KHR_DISPLAY_SPEC_VERSION 23

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

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

diff --cc external/vulkancts/framework/vulkan/vkVulkan_c.inl
index 7250514,f0bc5dd..1f4763d
--- 1/external/vulkancts/framework/vulkan/vkVulkan_c.inl
--- 2/external/vulkancts/framework/vulkan/vkVulkan_c.inl
+++ b/external/vulkancts/framework/vulkan/vkVulkan_c.inl
@@@ -6197,6 -6189,9 +6197,9 @@@ typedef enum VkDriverId 
      VK_DRIVER_ID_COREAVI_PROPRIETARY = 15,
      VK_DRIVER_ID_JUICE_PROPRIETARY = 16,
      VK_DRIVER_ID_VERISILICON_PROPRIETARY = 17,
 -      VK_DRIVER_ID_MESA_TURNIP = 18,
 -      VK_DRIVER_ID_MESA_V3DV = 19,
 -      VK_DRIVER_ID_MESA_PANVK = 20,
++    VK_DRIVER_ID_MESA_TURNIP = 18,
++    VK_DRIVER_ID_MESA_V3DV = 19,
++    VK_DRIVER_ID_MESA_PANVK = 20,
      VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY,
      VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE,
      VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV,

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

diff --cc external/vulkancts/scripts/gen_framework.py
index 1ce9d70,d27fe72..d7efaef
--- 1/external/vulkancts/scripts/gen_framework.py
--- 2/external/vulkancts/scripts/gen_framework.py
+++ b/external/vulkancts/scripts/gen_framework.py
@@@ -97,9 -97,9 +97,9 @@@ PLATFORM_TYPES                = 
        # VK_EXT_acquire_xlib_display
        (["RROutput"],                                                  ["RROutput"],                                   "void*"),
  
-       (["zx_handle_t"],                                               ["zx_handle_t"],                                "int32_t"),
 -      (["zx_handle_t"],                                               ["zx_handle_t"],                                "deUint32"),
 -      (["GgpFrameToken"],                                             ["GgpFrameToken"],                              "deInt32"),
 -      (["GgpStreamDescriptor"],                               ["GgpStreamDescriptor"],                "deInt32"),
++      (["zx_handle_t"],                                               ["zx_handle_t"],                                "uint32_t"),
 +      (["GgpFrameToken"],                                             ["GgpFrameToken"],                              "int32_t"),
 +      (["GgpStreamDescriptor"],                               ["GgpStreamDescriptor"],                "int32_t"),
        (["CAMetalLayer"],                                              ["CAMetalLayer"],                               "void*"),
  ]
  

diff --cc external/vulkancts/scripts/src/vulkan_core.h
index db1bbaf,3ea8a1d..e178a46
--- 1/external/vulkancts/scripts/src/vulkan_core.h
--- 2/external/vulkancts/scripts/src/vulkan_core.h
+++ b/external/vulkancts/scripts/src/vulkan_core.h
@@@ -5293,6 -5285,9 +5293,9 @@@ typedef enum VkDriverId 
      VK_DRIVER_ID_COREAVI_PROPRIETARY = 15,
      VK_DRIVER_ID_JUICE_PROPRIETARY = 16,
      VK_DRIVER_ID_VERISILICON_PROPRIETARY = 17,
 -      VK_DRIVER_ID_MESA_TURNIP = 18,
 -      VK_DRIVER_ID_MESA_V3DV = 19,
 -      VK_DRIVER_ID_MESA_PANVK = 20,
++    VK_DRIVER_ID_MESA_TURNIP = 18,
++    VK_DRIVER_ID_MESA_V3DV = 19,
++    VK_DRIVER_ID_MESA_PANVK = 20,
      VK_DRIVER_ID_AMD_PROPRIETARY_KHR = VK_DRIVER_ID_AMD_PROPRIETARY,
      VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR = VK_DRIVER_ID_AMD_OPEN_SOURCE,
      VK_DRIVER_ID_MESA_RADV_KHR = VK_DRIVER_ID_MESA_RADV,