From 9d89a2533514db230e7bfaf096c4d7e3fff4e0c4 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 13 Dec 2024 10:05:19 +0800 Subject: Make slang-rhi's NVAPI support conditional on SLANG_ENABLE_NVAPI (#5855) * bump slang-rhi * More precise slang-rhi settings --------- Co-authored-by: Yong He --- external/CMakeLists.txt | 6 ++++++ external/slang-rhi | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'external') diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 43105a5f0..446055a8b 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -107,12 +107,18 @@ if(SLANG_ENABLE_SLANG_RHI) set(SLANG_RHI_FETCH_DXC OFF) set(SLANG_RHI_FETCH_AGILITY_SDK OFF) + set(SLANG_RHI_ENABLE_NVAPI ${SLANG_ENABLE_NVAPI}) + if(SLANG_ENABLE_DX_ON_VK) set(SLANG_RHI_HAS_D3D12 ON) endif() if(CMAKE_SYSTEM_NAME STREQUAL "Linux") set(SLANG_RHI_ENABLE_WGPU OFF) endif() + if(MINGW) + set(SLANG_RHI_ENABLE_D3D11 OFF) + set(SLANG_RHI_ENABLE_D3D12 OFF) + endif() add_subdirectory(slang-rhi) endif() diff --git a/external/slang-rhi b/external/slang-rhi index 6c495919b..50cefeaa2 160000 --- a/external/slang-rhi +++ b/external/slang-rhi @@ -1 +1 @@ -Subproject commit 6c495919b92754f8489eb0085ad859344963dcd2 +Subproject commit 50cefeaa26a9ec6dfa1925f1a51c0302735f2dcf -- cgit v1.2.3