Merge vk-gl-cts/dev/VK_EXT_descriptor_buffer into vk-gl-cts/main

Change-Id: I47666bffd91171831a2d70f1255ae734c77b016d

diff --cc external/fetch_sources.py
index e4735e2,58e368d..817c62e
--- 1/external/fetch_sources.py
--- 2/external/fetch_sources.py
+++ b/external/fetch_sources.py
@@@ -313,9 -313,9 +313,9 @@@ PACKAGES = 
                "87d5b782bec60822aa878941e6b13c0a9a954c9b",
                "spirv-headers"),
        GitRepo(
 -              "https://gitlab.khronos.org/vulkan/vulkan.git",
 -              "git@gitlab.khronos.org:vulkan/vulkan.git",
 -              "974ec25f0229f7d2cba559f9f7cd76c433e468ec",
 +              "https://github.com/KhronosGroup/Vulkan-Docs.git",
 +              "git@github.com:KhronosGroup/Vulkan-Docs.git",
-               "7a319840243ea33aa4caa42cdce0143b150e02bb",
++              "d4987d251a1f63f184ea6ed9b20f5125cfd6a2d5",
                "vulkan-docs"),
        GitRepo(
                "https://github.com/google/amber.git",

diff --cc external/vulkancts/framework/vulkan/generated/vulkan/vkApiExtensionDependencyInfo.inl
index 1ec9cb0,bf72fa1..3815efb
--- 1/external/vulkancts/framework/vulkan/generated/vulkan/vkApiExtensionDependencyInfo.inl
--- 2/external/vulkancts/framework/vulkan/generated/vulkan/vkApiExtensionDependencyInfo.inl
+++ b/external/vulkancts/framework/vulkan/generated/vulkan/vkApiExtensionDependencyInfo.inl
@@@ -428,8 -436,8 +436,6 @@@ static const std::tuple<deUint32, deUin
        std::make_tuple(0, 1, 1, "VK_NV_ray_tracing_motion_blur", "VK_KHR_ray_tracing_pipeline"),
        std::make_tuple(0, 1, 2, "VK_NV_ray_tracing_motion_blur", "VK_KHR_ray_tracing_pipeline"),
        std::make_tuple(0, 1, 3, "VK_NV_ray_tracing_motion_blur", "VK_KHR_ray_tracing_pipeline"),
--      std::make_tuple(0, 1, 0, "VK_EXT_mesh_shader", "VK_KHR_get_physical_device_properties2"),
--      std::make_tuple(0, 1, 0, "VK_EXT_mesh_shader", "VK_KHR_spirv_1_4"),
        std::make_tuple(0, 1, 1, "VK_EXT_mesh_shader", "VK_KHR_spirv_1_4"),
        std::make_tuple(0, 1, 0, "VK_EXT_ycbcr_2plane_444_formats", "VK_KHR_sampler_ycbcr_conversion"),
        std::make_tuple(0, 1, 0, "VK_EXT_fragment_density_map2", "VK_EXT_fragment_density_map"),
@@@ -805,7 -824,7 +822,7 @@@ static const std::tuple<deUint32, deUin
        std::make_tuple(1, 0, "VK_KHR_zero_initialize_workgroup_memory"),
        std::make_tuple(1, 0, "VK_NV_fragment_shading_rate_enums"),
        std::make_tuple(1, 0, "VK_NV_ray_tracing_motion_blur"),
--      std::make_tuple(1, 0, "VK_EXT_mesh_shader"),
++      std::make_tuple(1, 1, "VK_EXT_mesh_shader"),
        std::make_tuple(1, 0, "VK_EXT_ycbcr_2plane_444_formats"),
        std::make_tuple(1, 0, "VK_EXT_fragment_density_map2"),
        std::make_tuple(1, 0, "VK_QCOM_rotated_copy_commands"),

diff --cc external/vulkancts/framework/vulkan/generated/vulkan/vkBasicTypes.inl
index 494cfec,d67f0e9..66d0e7e
--- 1/external/vulkancts/framework/vulkan/generated/vulkan/vkBasicTypes.inl
--- 2/external/vulkancts/framework/vulkan/generated/vulkan/vkBasicTypes.inl
+++ b/external/vulkancts/framework/vulkan/generated/vulkan/vkBasicTypes.inl
@@@ -4138,6 -4181,6 +4181,7 @@@ enum VkDriverI
        VK_DRIVER_ID_SAMSUNG_PROPRIETARY                        = 21,
        VK_DRIVER_ID_MESA_VENUS                                         = 22,
        VK_DRIVER_ID_MESA_DOZEN                                         = 23,
++      VK_DRIVER_ID_MESA_NVK                                           = 24,
        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/framework/vulkan/generated/vulkan/vkKnownDriverIds.inl
index 2e8ff37,2e8ff37..78d1b5b
--- 1/external/vulkancts/framework/vulkan/generated/vulkan/vkKnownDriverIds.inl
--- 2/external/vulkancts/framework/vulkan/generated/vulkan/vkKnownDriverIds.inl
+++ b/external/vulkancts/framework/vulkan/generated/vulkan/vkKnownDriverIds.inl
@@@ -32,6 -32,6 +32,7 @@@ static const struc
        {"VK_DRIVER_ID_SAMSUNG_PROPRIETARY", 21},
        {"VK_DRIVER_ID_MESA_VENUS", 22},
        {"VK_DRIVER_ID_MESA_DOZEN", 23},
++      {"VK_DRIVER_ID_MESA_NVK", 24},
        {"VK_DRIVER_ID_AMD_PROPRIETARY_KHR", 1},        // VK_DRIVER_ID_AMD_PROPRIETARY
        {"VK_DRIVER_ID_AMD_OPEN_SOURCE_KHR", 2},        // VK_DRIVER_ID_AMD_OPEN_SOURCE
        {"VK_DRIVER_ID_MESA_RADV_KHR", 3},      // VK_DRIVER_ID_MESA_RADV

diff --cc external/vulkancts/framework/vulkan/generated/vulkan/vkMandatoryFeatures.inl
index 19d8ab7,19d8ab7..cdc9c82
--- 1/external/vulkancts/framework/vulkan/generated/vulkan/vkMandatoryFeatures.inl
--- 2/external/vulkancts/framework/vulkan/generated/vulkan/vkMandatoryFeatures.inl
+++ b/external/vulkancts/framework/vulkan/generated/vulkan/vkMandatoryFeatures.inl
@@@ -142,6 -142,6 +142,16 @@@ bool checkMandatoryFeatures(const vkt::
                nextPtr  = &physicalDeviceDepthClipEnableFeaturesEXT.pNext;
        }
  
++      vk::VkPhysicalDeviceDescriptorBufferFeaturesEXT physicalDeviceDescriptorBufferFeaturesEXT;
++      deMemset(&physicalDeviceDescriptorBufferFeaturesEXT, 0, sizeof(physicalDeviceDescriptorBufferFeaturesEXT));
++
++      if ( isExtensionStructSupported(deviceExtensions, RequiredExtension("VK_EXT_descriptor_buffer")) )
++      {
++              physicalDeviceDescriptorBufferFeaturesEXT.sType = getStructureType<VkPhysicalDeviceDescriptorBufferFeaturesEXT>();
++              *nextPtr = &physicalDeviceDescriptorBufferFeaturesEXT;
++              nextPtr  = &physicalDeviceDescriptorBufferFeaturesEXT.pNext;
++      }
++
        vk::VkPhysicalDeviceDescriptorIndexingFeatures physicalDeviceDescriptorIndexingFeatures;
        deMemset(&physicalDeviceDescriptorIndexingFeatures, 0, sizeof(physicalDeviceDescriptorIndexingFeatures));
  
@@@ -938,6 -938,6 +948,15 @@@
                }
        }
  
++      if ( isExtensionStructSupported(deviceExtensions, RequiredExtension("VK_EXT_descriptor_buffer")) )
++      {
++              if ( physicalDeviceDescriptorBufferFeaturesEXT.descriptorBuffer == VK_FALSE )
++              {
++                      log << tcu::TestLog::Message << "Mandatory feature descriptorBuffer not supported" << tcu::TestLog::EndMessage;
++                      result = false;
++              }
++      }
++
        if ( isExtensionStructSupported(deviceExtensions, RequiredExtension("VK_EXT_descriptor_indexing")) )
        {
                if ( physicalDeviceDescriptorIndexingFeatures.shaderUniformTexelBufferArrayDynamicIndexing == VK_FALSE )

diff --cc external/vulkancts/framework/vulkan/generated/vulkan/vkStrUtilImpl.inl
index 6eed66e,1a0b35a..22e400c
--- 1/external/vulkancts/framework/vulkan/generated/vulkan/vkStrUtilImpl.inl
--- 2/external/vulkancts/framework/vulkan/generated/vulkan/vkStrUtilImpl.inl
+++ b/external/vulkancts/framework/vulkan/generated/vulkan/vkStrUtilImpl.inl
@@@ -4110,6 -4160,6 +4160,7 @@@ const char* getDriverIdName (VkDriverI
                case VK_DRIVER_ID_SAMSUNG_PROPRIETARY:                  return "VK_DRIVER_ID_SAMSUNG_PROPRIETARY";
                case VK_DRIVER_ID_MESA_VENUS:                                   return "VK_DRIVER_ID_MESA_VENUS";
                case VK_DRIVER_ID_MESA_DOZEN:                                   return "VK_DRIVER_ID_MESA_DOZEN";
++              case VK_DRIVER_ID_MESA_NVK:                                             return "VK_DRIVER_ID_MESA_NVK";
                default:                                                                                return DE_NULL;
        }
  }

diff --cc external/vulkancts/framework/vulkan/generated/vulkan/vkVulkan_c.inl
index 953b707,dd7a25e..d73b659
--- 1/external/vulkancts/framework/vulkan/generated/vulkan/vkVulkan_c.inl
--- 2/external/vulkancts/framework/vulkan/generated/vulkan/vkVulkan_c.inl
+++ b/external/vulkancts/framework/vulkan/generated/vulkan/vkVulkan_c.inl
@@@ -1133,7 -1133,7 +1133,7 @@@ extern "C" 
  #define VK_API_VERSION_1_0 VK_MAKE_API_VERSION(0, 1, 0, 0)// Patch version should always be set to 0
  
  // Version of this file
- #define VK_HEADER_VERSION 231
 -#define VK_HEADER_VERSION 234
++#define VK_HEADER_VERSION 235
  
  // Complete version of this file
  #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION)
@@@ -6766,6 -6795,6 +6795,7 @@@ typedef enum VkDriverId 
      VK_DRIVER_ID_SAMSUNG_PROPRIETARY = 21,
      VK_DRIVER_ID_MESA_VENUS = 22,
      VK_DRIVER_ID_MESA_DOZEN = 23,
++    VK_DRIVER_ID_MESA_NVK = 24,
      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/scripts/src/extensions/VK_EXT_descriptor_buffer.json
index 0000000,0000000..88bdd9a
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/external/vulkancts/scripts/src/extensions/VK_EXT_descriptor_buffer.json
@@@ -1,0 -1,0 +1,9 @@@
++{
++      "mandatory_features":
++      {
++              "VkPhysicalDeviceDescriptorBufferFeaturesEXT":
++              [
++                      { "features": ["descriptorBuffer"],     "requirements": ["VK_EXT_descriptor_buffer"] }
++              ]
++      }
++}