igl | Add SPIRV-Headers to fix GitHub Actions (#54)

Summary: Pull Request resolved: #54 Test Plan: https://github.com/facebook/igl/actions Updated dependencies: https://www.internalfb.com/intern/wiki/IGL/IGL_CMake_CI_Builds/ Reviewed By: EricGriffith Differential Revision: D51513206 Pulled By: corporateshark fbshipit-source-id: 1f751d2003c722f1202d17af048f32e13438b16e
facebook · Nov 22, 2023 · 7a24f36 · 7a24f36
1 parent eb04676
commit 7a24f36
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -108,8 +108,8 @@ jobs:
         - name: Prepare Vulkan SDK
           uses: humbletim/[email protected]
           with:
-            vulkan-query-version: 1.3.204.0
-            vulkan-components: Vulkan-Headers, Vulkan-Loader
+            vulkan-query-version: 1.3.268.0
+            vulkan-components: Vulkan-Headers, Vulkan-Loader, SPIRV-Headers
             vulkan-use-cache: true
 
         - name: Get the number of CPU cores

diff --git a/deploy_content.py b/deploy_content.py
diff --git a/deploy_deps.py b/deploy_deps.py
diff --git a/src/igl/vulkan/CMakeLists.txt b/src/igl/vulkan/CMakeLists.txt
@@ -52,6 +52,7 @@ target_link_libraries(IGLVulkan PUBLIC fmt)
 
 target_include_directories(IGLVulkan PUBLIC "${IGL_ROOT_DIR}/third-party/deps/src/volk")
 target_include_directories(IGLVulkan PUBLIC "${IGL_ROOT_DIR}/third-party/deps/src/vma/include")
+target_include_directories(IGLVulkan PUBLIC "${IGL_ROOT_DIR}/third-party/deps/src/SPIRV-Headers/include")
 
 if(WIN32)
   add_definitions("-DVK_USE_PLATFORM_WIN32_KHR=1")

diff --git a/src/igl/vulkan/util/SpvReflection.cpp b/src/igl/vulkan/util/SpvReflection.cpp
@@ -7,11 +7,7 @@
 
 #include <igl/vulkan/util/SpvReflection.h>
 
-#if defined(IGL_CMAKE_BUILD) && !IGL_PLATFORM_LINUX
-#include <spirv-headers/spirv.h>
-#else
 #include <spirv/unified1/spirv.h>
-#endif // IGL_CMAKE_BUILD
 
 #define IGL_COMMON_SKIP_CHECK
 #include <igl/Assert.h>

diff --git a/third-party/bootstrap-deps.json b/third-party/bootstrap-deps.json
@@ -15,6 +15,14 @@
         "revision": "12.1.0"
     }
 },
+{
+    "name": "SPIRV-Headers",
+    "source": {
+        "type": "git",
+        "url": "https://github.com/KhronosGroup/SPIRV-Headers.git",
+        "revision": "cca08c63cefa129d082abca0302adcb81610b465"
+    }
+},
 {
     "name": "tinyobjloader",
     "source": {