Skip to content

Commit

Permalink
Disable wgpu on linux (#5186)
Browse files Browse the repository at this point in the history
* remove setting CMAKE_SYSTEM_PROCESSOR

we will need a proper toolchain file to setup cross-compilation

* disable slang-rhi webgpu backend on linux

this is a temporary fix for allowing the release workflow to run
  • Loading branch information
skallweitNV authored Sep 30, 2024
1 parent 24f56d0 commit 6724651
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,11 @@ jobs:
export CC=aarch64-linux-gnu-gcc
export CXX=aarch64-linux-gnu-g++
fi
CMAKE_SYSTEM_PROCESSOR="${{matrix.platform}}"
CMAKE_OSX_ARCHITECTURES="${{matrix.platform}}"
CMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES//aarch64/arm64}
echo "CC=$CC" >> "$GITHUB_ENV"
echo "CXX=$CXX" >> "$GITHUB_ENV"
echo "CMAKE_SYSTEM_PROCESSOR=$CMAKE_SYSTEM_PROCESSOR" >> "$GITHUB_ENV"
echo "CMAKE_OSX_ARCHITECTURES=$CMAKE_OSX_ARCHITECTURES" >> "$GITHUB_ENV"
- name: Build Slang
Expand Down
3 changes: 3 additions & 0 deletions external/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ set(SLANG_RHI_BINARY_DIR ${CMAKE_BINARY_DIR}/$<CONFIG>/bin)
set(SLANG_RHI_SLANG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
set(SLANG_RHI_SLANG_BINARY_DIR ${CMAKE_BINARY_DIR})
set(SLANG_RHI_BUILD_TESTS OFF)
if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(SLANG_RHI_ENABLE_WGPU OFF)
endif()
if(SLANG_ENABLE_DX_ON_VK)
set(SLANG_RHI_HAS_D3D12 ON)
endif()
Expand Down

0 comments on commit 6724651

Please sign in to comment.