Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

slang-rhi cmake integration #6261

Merged
merged 6 commits into from
Feb 7, 2025
Merged

slang-rhi cmake integration #6261

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c3ac7eb
update slang-rhi cmake integration
skallweitNV Feb 4, 2025
9e07f8f
disable fetching slang
skallweitNV Feb 4, 2025
5b02522
update slang-rhi
skallweitNV Feb 7, 2025
88ae77c
disable slang-rhi for wasm build
skallweitNV Feb 7, 2025
f772a59
update slang-rhi
skallweitNV Feb 7, 2025
e86b452
Merge branch 'master' into test-slang-rhi-cmake
skallweitNV Feb 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions external/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion external/slang-rhi
Open in desktop
Submodule slang-rhi updated 20 files
+7 −16 .github/workflows/ci.yml
+3 −0 .gitmodules
+4 −0 .reuse/dep5
+143 −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
Loading