From cc81f271fcd712da60afefc29dec743556b04838 Mon Sep 17 00:00:00 2001 From: Anders Leino Date: Thu, 31 Oct 2024 14:09:28 +0200 Subject: [PATCH] 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.) --- 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 9a27f7bcc5..ec60e5241c 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 ebc2b53ee9..180464b57e 160000 --- a/external/slang-rhi +++ b/external/slang-rhi @@ -1 +1 @@ -Subproject commit ebc2b53ee9a06b73e26fa7ca6d2ee30fcf53b6d7 +Subproject commit 180464b57e7806a741ff84cc83fd5f11b8a2ae9d