update wgpu-native to 29.0.0.0 (#4222)
This commit is contained in:
8
.github/workflows/android-ci.yml
vendored
8
.github/workflows/android-ci.yml
vendored
@@ -380,9 +380,6 @@ jobs:
|
||||
with:
|
||||
toolchain: stable
|
||||
|
||||
- name: Add Android Rust target
|
||||
run: rustup target add ${{ env.RUST_TARGET }}
|
||||
|
||||
- name: Configure cargo for Android NDK linker
|
||||
run: |
|
||||
LATEST_NDK=$(find "$ANDROID_SDK_ROOT/ndk" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -n 1)
|
||||
@@ -396,6 +393,11 @@ jobs:
|
||||
- name: Pre-build wgpu-native for Android
|
||||
working-directory: vendor/wgpu-native
|
||||
run: |
|
||||
# vendor/wgpu-native pins its own rust toolchain; install targets for that active toolchain
|
||||
ACTIVE_TOOLCHAIN=$(rustup show active-toolchain | awk '{print $1}')
|
||||
rustup target add ${{ env.RUST_TARGET }} --toolchain "$ACTIVE_TOOLCHAIN"
|
||||
rustup target list --toolchain "$ACTIVE_TOOLCHAIN" --installed | grep -x '${{ env.RUST_TARGET }}'
|
||||
|
||||
LATEST_NDK=$(find "$ANDROID_SDK_ROOT/ndk" -mindepth 1 -maxdepth 1 -type d | sort -V | tail -n 1)
|
||||
NDK_PREBUILT="$LATEST_NDK/toolchains/llvm/prebuilt/linux-x86_64"
|
||||
RESOURCE_DIR=$("$NDK_PREBUILT/bin/clang" --print-resource-dir)
|
||||
|
||||
9
.github/workflows/ios-ci.yml
vendored
9
.github/workflows/ios-ci.yml
vendored
@@ -260,8 +260,13 @@ jobs:
|
||||
with:
|
||||
toolchain: stable
|
||||
|
||||
- name: Add iOS Rust target
|
||||
run: rustup target add aarch64-apple-ios
|
||||
- name: Ensure iOS Rust targets are installed for active toolchain
|
||||
working-directory: vendor/wgpu-native
|
||||
run: |
|
||||
# vendor/wgpu-native pins its own rust toolchain; install targets for that active toolchain
|
||||
ACTIVE_TOOLCHAIN=$(rustup show active-toolchain | awk '{print $1}')
|
||||
rustup target add aarch64-apple-ios --toolchain "$ACTIVE_TOOLCHAIN"
|
||||
rustup target list --toolchain "$ACTIVE_TOOLCHAIN" --installed | grep -x 'aarch64-apple-ios'
|
||||
|
||||
- name: Configure build with CMake
|
||||
run: cmake --preset ios-webgpu-wgpu
|
||||
|
||||
Reference in New Issue
Block a user