diff options
| author | Ellie Hermaszewska <ellieh@nvidia.com> | 2024-12-13 10:05:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-12 18:05:19 -0800 |
| commit | 9d89a2533514db230e7bfaf096c4d7e3fff4e0c4 (patch) | |
| tree | c4e62b59c6eda48f5fec6b87cf47b41581c7ad76 | |
| parent | 78c9bd1c2fbd55889e62a2032e9bc96684ced3b5 (diff) | |
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 <yonghe@outlook.com>
| -rw-r--r-- | external/CMakeLists.txt | 6 | ||||
| m--------- | external/slang-rhi | 0 |
2 files changed, 6 insertions, 0 deletions
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 -Subproject 6c495919b92754f8489eb0085ad859344963dcd +Subproject 50cefeaa26a9ec6dfa1925f1a51c0302735f2dc |