From c044ec220d87cfe38d69ecb954ecc4125ee11877 Mon Sep 17 00:00:00 2001 From: Anders Leino Date: Fri, 1 Nov 2024 12:10:06 +0200 Subject: Update Slang-RHI to get recent WGPU fixes (#5467) 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.) --- external/CMakeLists.txt | 5 +++++ external/slang-rhi | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 9a27f7bcc..ec60e5241 100644 --- 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 index ebc2b53ee..180464b57 160000 --- a/external/slang-rhi +++ b/external/slang-rhi @@ -1 +1 @@ -Subproject commit ebc2b53ee9a06b73e26fa7ca6d2ee30fcf53b6d7 +Subproject commit 180464b57e7806a741ff84cc83fd5f11b8a2ae9d -- cgit v1.2.3