Update Slang-RHI to get recent WGPU fixes

This helps to address issue #5222. Also disable Slang-RHI from fetching DXC and Agility SDK, since that seems to break our tests. (See issue #5474.)
shader-slang · Nov 1, 2024 · cc81f27 · cc81f27
1 parent 07e45ad
commit cc81f27
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -98,6 +98,11 @@ if(SLANG_ENABLE_SLANG_RHI)
     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)
+    set(SLANG_RHI_FETCH_AGILITY_SDK OFF)
+
     if(SLANG_ENABLE_DX_ON_VK)
         set(SLANG_RHI_HAS_D3D12 ON)
     endif()

diff --git a/external/slang-rhi b/external/slang-rhi
+22 −4		.github/workflows/ci.yml
+80 −34		CMakeLists.txt
+3 −3		src/core/string.h
+0 −120		src/d3d/d3d-util.cpp
+0 −48		src/d3d/d3d-util.h
+118 −0		src/d3d12/d3d12-acceleration-structure.cpp
+47 −0		src/d3d12/d3d12-acceleration-structure.h
+1 −1		src/d3d12/d3d12-command-encoder.cpp
+1 −1		src/d3d12/d3d12-device.cpp
+132 −0		src/vulkan/vk-acceleration-structure.cpp
+49 −0		src/vulkan/vk-acceleration-structure.h
+0 −131		src/vulkan/vk-util.cpp
+0 −49		src/vulkan/vk-util.h
+1 −0		src/wgpu/wgpu-buffer.cpp
+2 −0		src/wgpu/wgpu-shader-object-layout.cpp