slang-rhi cmake integration (#6261)

* update slang-rhi cmake integration * disable fetching slang * update slang-rhi
shader-slang · Feb 7, 2025 · 8d47910 · 8d47910
1 parent 654b969
commit 8d47910
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -23,6 +23,7 @@
       "cacheVariables": {
         "SLANG_SLANG_LLVM_FLAVOR": "DISABLE",
         "SLANG_ENABLE_SPLIT_DEBUG_INFO": "OFF",
+        "SLANG_ENABLE_SLANG_RHI": "OFF",
         "CMAKE_C_FLAGS_INIT": "-fwasm-exceptions -Os",
         "CMAKE_CXX_FLAGS_INIT": "-fwasm-exceptions -Os",
         "CMAKE_EXE_LINKER_FLAGS": "-sASSERTIONS -sALLOW_MEMORY_GROWTH -fwasm-exceptions --export=__cpp_exception"

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -97,11 +97,11 @@ target_include_directories(stb INTERFACE "${CMAKE_CURRENT_LIST_DIR}/stb")
 
 # slang-rhi
 if(SLANG_ENABLE_SLANG_RHI)
+    set(SLANG_RHI_BUILD_FROM_SLANG_REPO ON)
     set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/bin)
+    set(SLANG_RHI_FETCH_SLANG OFF)
     set(SLANG_RHI_SLANG_INCLUDE_DIR ${slang_SOURCE_DIR}/include)
     set(SLANG_RHI_SLANG_BINARY_DIR ${CMAKE_BINARY_DIR})
-    set(SLANG_RHI_BUILD_TESTS OFF)
-    set(SLANG_RHI_BUILD_EXAMPLES OFF)
 
     # Not disabling these break tests (issue #5474)
     set(SLANG_RHI_FETCH_DXC OFF)

diff --git a/external/slang-rhi b/external/slang-rhi
+7 −16		.github/workflows/ci.yml
+3 −0		.gitmodules
+4 −0		.reuse/dep5
+144 −92		CMakeLists.txt
+2 −0		README.md
+0 −1		cmake/FetchPackage.cmake
+1 −0		external/nanothread
+31 −0		include/slang-rhi.h
+499 −0		src/core/offset-allocator.cpp
+98 −0		src/core/offset-allocator.h
+14 −0		src/core/short_vector.h
+2 −1		src/core/smart-pointer.h
+195 −0		src/core/task-pool.cpp
+50 −0		src/core/task-pool.h
+2 −0		src/d3d12/d3d12-pipeline.cpp
+13 −0		src/rhi.cpp
+13 −7		src/wgpu/wgpu-buffer.cpp
+30 −67		src/wgpu/wgpu-device.cpp
+260 −0		tests/test-offset-allocator.cpp
+171 −0		tests/test-task-pool.cpp