Skip to content

Commit

Permalink
Merge branch 'trunk' into prefer-opengl
Browse files Browse the repository at this point in the history
  • Loading branch information
valaphee authored Apr 12, 2024
2 parents e359cfe + 9df6819 commit f693e05
Show file tree
Hide file tree
Showing 454 changed files with 45,854 additions and 5,023 deletions.
10 changes: 1 addition & 9 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,2 @@
[alias]
xtask = "run --manifest-path xtask/Cargo.toml"

[build]
rustflags = [
"--cfg=web_sys_unstable_apis"
]
rustdocflags = [
"--cfg=web_sys_unstable_apis"
]
xtask = "run --manifest-path xtask/Cargo.toml --"
1 change: 1 addition & 0 deletions .deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ skip-tree = [
{ name = "windows-sys", version = "0.45" },
{ name = "winit", version = "0.27.5" },
{ name = "rustc_version", version = "0.2.3" },
{ name = "sourcemap", version = "7.1.1" },
]
skip = [
{ name = "hlsl-snapshots", version = "0.1.0" },
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.mtl binary
*.obj binary
wgpu/src/backend/webgpu/webgpu_sys/** linguist-generated=true
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ env:
# Once 1.76 coes out, we can use that instead of nightly.
DOCS_RUST_VERSION: "nightly-2023-12-17"
# This is the MSRV used by `wgpu` itself and all surrounding infrastructure.
REPO_MSRV: "1.71"
REPO_MSRV: "1.76"
# This is the MSRV used by the `wgpu-core`, `wgpu-hal`, and `wgpu-types` crates,
# to ensure that they can be used with firefox.
CORE_MSRV: "1.70"
CORE_MSRV: "1.74"

#
# Environment variables
Expand All @@ -55,8 +55,8 @@ env:
RUST_LOG: info
RUST_BACKTRACE: full
PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
RUSTFLAGS: --cfg=web_sys_unstable_apis -D warnings
RUSTDOCFLAGS: --cfg=web_sys_unstable_apis -D warnings
RUSTFLAGS: -D warnings
RUSTDOCFLAGS: -D warnings
WASM_BINDGEN_TEST_TIMEOUT: 300 # 5 minutes
CACHE_SUFFIX: c # cache busting

Expand Down Expand Up @@ -344,7 +344,7 @@ jobs:
wasm-test:
# runtime is normally 2 minutes
timeout-minutes: 10

name: Test WebAssembly
runs-on: ubuntu-latest
needs: [check]
Expand Down Expand Up @@ -614,7 +614,7 @@ jobs:
cargo fmt --manifest-path xtask/Cargo.toml -- --check
- name: Check for typos
uses: crate-ci/typos@v1.18.0
uses: crate-ci/typos@v1.19.0

check-cts-runner:
# runtime is normally 2 minutes
Expand Down Expand Up @@ -672,7 +672,7 @@ jobs:
cargo-deny-check-rest:
# runtime is normally 1 minute
timeout-minutes: 5

name: "cargo-deny"
runs-on: ubuntu-latest
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
CARGO_INCREMENTAL: false
CARGO_TERM_COLOR: always
RUST_BACKTRACE: full
RUSTFLAGS: --cfg=web_sys_unstable_apis
RUSTFLAGS:

jobs:
publish:
Expand Down
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ target/
# Output from capture example
wgpu/red.png

# Output from render_to_texture example
**/please_don't_git_push_me.png

# Output from invalid comparison tests
**/*-actual.png
**/*-difference.png
Expand All @@ -31,3 +34,6 @@ cts/

# Cached GPU config
.gpuconfig

# Temporary clone location for wasm-bindgen mirroring
wgpu/src/backend/webgpu/webgpu_sys/wasm_bindgen_clone_tmp
272 changes: 219 additions & 53 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit f693e05

Please sign in to comment.