Skip to content

Commit

Permalink
Merge branch 'trunk' into releaseMoreGPUResources
Browse files Browse the repository at this point in the history
  • Loading branch information
nical authored Jan 22, 2024
2 parents 05f04f5 + 20f3a9f commit c543a47
Show file tree
Hide file tree
Showing 60 changed files with 1,301 additions and 762 deletions.
3 changes: 3 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ xtask = "run --manifest-path xtask/Cargo.toml"
rustflags = [
"--cfg=web_sys_unstable_apis"
]
rustdocflags = [
"--cfg=web_sys_unstable_apis"
]
3 changes: 2 additions & 1 deletion .deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ skip-tree = [
{ name = "rustc_version", version = "0.2.3" },
]
skip = [
{ name = "hlsl-snapshots", version = "0.1.0" },
]
wildcards = "deny"
allow-wildcard-paths = true

[licenses]
allow = [
Expand All @@ -26,7 +28,6 @@ allow = [
[sources]
allow-git = [
# Waiting on releases; used in examples only
"https://github.com/SiegeEngine/ddsfile",
"https://github.com/Razaekel/noise-rs",

"https://github.com/grovesNL/glow",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ env:
RUST_BACKTRACE: full
PKG_CONFIG_ALLOW_CROSS: 1 # allow android to work
RUSTFLAGS: --cfg=web_sys_unstable_apis -D warnings
RUSTDOCFLAGS: -Dwarnings
RUSTDOCFLAGS: --cfg=web_sys_unstable_apis -D warnings
WASM_BINDGEN_TEST_TIMEOUT: 300 # 5 minutes
CACHE_SUFFIX: c # cache busting

Expand Down
330 changes: 210 additions & 120 deletions CHANGELOG.md

Large diffs are not rendered by default.

Loading

0 comments on commit c543a47

Please sign in to comment.