From 682e42f7ae70a8fadf374199c02de737daa5c70d Mon Sep 17 00:00:00 2001
From: Charles Giessen <charles@lunarg.com>
Date: Wed, 23 Apr 2025 18:16:06 -0500
Subject: build: Remove Volk dependency

The intent of using Volk for function loading was to validate Volk's
implementation continually with each header update. This didn't end up
occurring, as Volk does not get updated in lock step with Vulkan-Tools,
leading to Vulkan-Tools using an older version of Volk. And then during
SDK release the version would need to be updated at the last minute,
causing churn and extra work.

Function loading now occurs in two new files, cube_functions.h and
vulkaninfo_functions.h. Since both cube and vulkaninfo's function
usage are fixed (as in not code-generated), it is straightforward to
implement the necessary Vulkan-Loader library opening and function
loading code.
---
 scripts/CMakeLists.txt  |  3 ---
 scripts/known_good.json | 19 -------------------
 2 files changed, 22 deletions(-)

(limited to 'scripts')

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 5fbe7023..65c8bade 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -121,9 +121,6 @@ endif()
 if (VULKAN_HEADERS_INSTALL_DIR)
     list(APPEND CMAKE_PREFIX_PATH ${VULKAN_HEADERS_INSTALL_DIR})
 endif()
-if (VOLK_INSTALL_DIR)
-    list(APPEND CMAKE_PREFIX_PATH ${VOLK_INSTALL_DIR})
-endif()
 if (GOOGLETEST_INSTALL_DIR)
     list(APPEND CMAKE_PREFIX_PATH ${GOOGLETEST_INSTALL_DIR})
 endif()
diff --git a/scripts/known_good.json b/scripts/known_good.json
index 62f7a6e6..688727b2 100644
--- a/scripts/known_good.json
+++ b/scripts/known_good.json
@@ -25,24 +25,6 @@
                 "darwin"
             ]
         },
-        {
-            "name": "volk",
-            "api": "vulkan",
-            "url": "https://github.com/zeux/volk",
-            "sub_dir": "volk",
-            "build_dir": "volk/build",
-            "install_dir": "volk/build/install",
-            "cmake_options": [
-                "-DVOLK_INSTALL=ON"
-            ],
-            "commit": "43c29e655cb8117fd9cfb65ad9cefe2d40965102",
-            "deps": [
-                {
-                    "var_name": "VULKAN_HEADERS_INSTALL_DIR",
-                    "repo_name": "Vulkan-Headers"
-                }
-            ]
-        },
         {
             "name": "googletest",
             "url": "https://github.com/google/googletest.git",
@@ -90,7 +72,6 @@
     ],
     "install_names": {
         "Vulkan-Headers": "VULKAN_HEADERS_INSTALL_DIR",
-        "volk": "VOLK_INSTALL_DIR",
         "MoltenVK": "MOLTENVK_REPO_ROOT",
         "googletest": "GOOGLETEST_INSTALL_DIR",
         "Vulkan-Loader": "VULKAN_LOADER_INSTALL_DIR"
-- 
cgit v1.2.3