Update external sources for Vulkan 1.4

Change-Id: I027aa83f566b3e3b8ebd4810be445ccefb709de7
KhronosGroup · Dec 3, 2024 · 1fb17bc · 1fb17bc
1 parent f022e38
commit 1fb17bc
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 16 deletions.
diff --git a/external/fetch_sources.py b/external/fetch_sources.py
@@ -317,35 +317,35 @@ def postExtractLibpng (path):
         "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e",
         "renderdoc"),
     GitRepo(
-        "https://gitlab.khronos.org/spirv/spirv-tools.git",
-        "git@gitlab.khronos.org:spirv/spirv-tools.git",
-        "0c84b0a133086a6e0b736f41dc899ce940ca33fc",
+        "https://github.com/KhronosGroup/SPIRV-Tools.git",
+        "git@github.com:KhronosGroup/SPIRV-Tools.git",
+        "3fb52548bc8a68d349d31e21bd4e80e3d953e87c",
         "spirv-tools"),
     GitRepo(
         "https://github.com/KhronosGroup/glslang.git",
         "[email protected]:KhronosGroup/glslang.git",
-        "c5b76b78c9dec95251e9c1840a671e19bf61abe3",
+        "a0995c49ebcaca2c6d3b03efbabf74f3843decdb",
         "glslang",
         removeTags = ["main-tot", "master-tot"]),
     GitRepo(
         "https://github.com/KhronosGroup/SPIRV-Headers.git",
         "[email protected]:KhronosGroup/SPIRV-Headers.git",
-        "2a9b6f951c7d6b04b6c21fe1bf3f475b68b84801",
+        "36d5e2ddaa54c70d2f29081510c66f4fc98e5e53",
         "spirv-headers"),
     GitRepo(
-        "https://gitlab.khronos.org/vulkan/vulkan.git",
-        "git@gitlab.khronos.org:vulkan/vulkan.git",
-        "3ff288caf086a12e509410fa4307cba142a1be7d",
+        "https://github.com/KhronosGroup/Vulkan-Docs.git",
+        "git@github.com:KhronosGroup/Vulkan-Docs.git",
+        "c7a3955e47d223c6a37fb29e2061c973eec98d0a",
         "vulkan-docs"),
     GitRepo(
         "https://github.com/KhronosGroup/Vulkan-ValidationLayers.git",
         "[email protected]:KhronosGroup/Vulkan-ValidationLayers.git",
-        "9a46ae006fa5c92e2d2af7944187f7794210844b",
+        "902f3cf8d51e76be0c0deb4be39c6223abebbae2",
         "vulkan-validationlayers"),
     GitRepo(
-        "https://gitlab.khronos.org/spirv/amber.git",
-        "git@gitlab.khronos.org:spirv/amber.git",
-        "6f0251977e51c26609a5ceed3339537639741abf",
+        "https://github.com/google/amber.git",
+        "git@github.com:google/amber.git",
+        "1ec5e96db7e0343d045a52c590e30eba154f74a8",
         "amber"),
     GitRepo(
         "https://github.com/open-source-parsers/jsoncpp.git",

diff --git a/external/vulkancts/framework/vulkan/generated/vulkan/vkVulkan_c.inl b/external/vulkancts/framework/vulkan/generated/vulkan/vkVulkan_c.inl
@@ -1962,7 +1962,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 302
+#define VK_HEADER_VERSION 303
 
 // Complete version of this file
 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 4, VK_HEADER_VERSION)
@@ -17921,9 +17921,9 @@ VKAPI_ATTR VkResult VKAPI_CALL vkCreateHeadlessSurfaceEXT(
 #define VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME "VK_EXT_line_rasterization"
 typedef VkLineRasterizationMode VkLineRasterizationModeEXT;
 
-typedef VkPhysicalDeviceLineRasterizationFeaturesKHR VkPhysicalDeviceLineRasterizationFeaturesEXT;
+typedef VkPhysicalDeviceLineRasterizationFeatures VkPhysicalDeviceLineRasterizationFeaturesEXT;
 
-typedef VkPhysicalDeviceLineRasterizationPropertiesKHR VkPhysicalDeviceLineRasterizationPropertiesEXT;
+typedef VkPhysicalDeviceLineRasterizationProperties VkPhysicalDeviceLineRasterizationPropertiesEXT;
 
 typedef VkPipelineRasterizationLineStateCreateInfo VkPipelineRasterizationLineStateCreateInfoEXT;
 
@@ -19999,7 +19999,7 @@ typedef struct VkPhysicalDevicePrimitivesGeneratedQueryFeaturesEXT {
 #define VK_EXT_GLOBAL_PRIORITY_QUERY_SPEC_VERSION 1
 #define VK_EXT_GLOBAL_PRIORITY_QUERY_EXTENSION_NAME "VK_EXT_global_priority_query"
 #define VK_MAX_GLOBAL_PRIORITY_SIZE_EXT   VK_MAX_GLOBAL_PRIORITY_SIZE
-typedef VkPhysicalDeviceGlobalPriorityQueryFeaturesKHR VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT;
+typedef VkPhysicalDeviceGlobalPriorityQueryFeatures VkPhysicalDeviceGlobalPriorityQueryFeaturesEXT;
 
 typedef VkQueueFamilyGlobalPriorityProperties VkQueueFamilyGlobalPriorityPropertiesEXT;
 

diff --git a/external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp b/external/vulkancts/modules/vulkan/amber/vktAmberTestCase.cpp
@@ -285,6 +285,9 @@ class Delegate : public amber::Delegate
     amber::Result LoadBufferData(const std::string file_name, amber::BufferDataFileType file_type,
                                  amber::BufferInfo *buffer) const override;
 
+    amber::Result LoadFile(const std::string file_name,
+                           std::vector<char>* buffer) const override;
+
     void Log(const std::string & /*message*/) override
     {
         DE_FATAL("amber::Delegate::Log unimplemented");
@@ -370,6 +373,30 @@ amber::Result Delegate::LoadBufferData(const std::string file_name, amber::Buffe
     return {};
 }
 
+amber::Result Delegate::LoadFile(const std::string file_name,
+                                 std::vector<char>* buffer) const
+{
+    if (!buffer) {
+        return amber::Result("Buffer pointer is null.");
+    }
+
+    const tcu::Archive &archive = m_testCtx.getArchive();
+    const de::FilePath filePath = de::FilePath(m_path).join(file_name);
+    de::UniquePtr<tcu::Resource> file(archive.getResource(filePath.getPath()));
+    int numBytes = file->getSize();
+    std::vector<uint8_t> bytes(numBytes);
+
+    file->read(bytes.data(), numBytes);
+
+    if (bytes.empty())
+        return amber::Result("Failed to load buffer data " + file_name);
+
+    // Convert uint8_t vector to char vector
+    buffer->assign(bytes.begin(), bytes.end());
+
+    return {};
+}
+
 bool AmberTestCase::parse(const std::string &readFilename)
 {
     std::string script = ShaderSourceProvider::getSource(m_testCtx.getArchive(), readFilename.c_str());