Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
852 changes: 673 additions & 179 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions crates/rustc_codegen_spirv/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ ahash = { version = "0.8.11", features = ["no-rng"] }
bytemuck = { version = "1.20.0", features = ["aarch64_simd", "derive"] }
log = { version = "0.4.22", features = ["std"] }
regex = { version = "1", features = ["perf"] }
rustix = { version = "0.38.42", features = ["all-apis"] }
rustix = { version = "1.0.8", features = ["all-apis"] }

# HACK(eddyb) deps of `rustc_codegen_ssa`, for `pqp_cg_ssa` (see `build.rs`),
# that cannot be handled with just `extern crate` pulling out of the sysroot.
object = { version = "0.36.2", default-features = false, features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"] }
thorin-dwp = "0.8"
object = { version = "0.37.1", default-features = false, features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"] }
thorin-dwp = "0.9.0"

# Normal dependencies.
ar = "0.9.0"
Expand All @@ -51,15 +51,15 @@ indexmap = "2.6.0"
rspirv = "0.12"
rustc_codegen_spirv-types.workspace = true
rustc-demangle = "0.1.21"
sanitize-filename = "0.4"
sanitize-filename = "0.6.0"
smallvec = { version = "1.6.1", features = ["const_generics", "const_new", "union"] }
spirt = "0.4.0"
spirv-tools.workspace = true
lazy_static = "1.4.0"
itertools = "0.10.5"
itertools = "0.14.0"
tracing.workspace = true
tracing-subscriber.workspace = true
tracing-tree = "0.3.0"
tracing-tree = "0.4.0"

# required for cargo gpu to resolve the needed target specs
rustc_codegen_spirv-target-specs.workspace = true
Expand Down
7 changes: 3 additions & 4 deletions crates/spirv-builder/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,8 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "2.0.12"
semver = { version = "1.0.24", features = ["serde"] }
cargo_metadata = "0.19.2"
cargo_metadata = "0.21.0"

notify = { version = "7.0", optional = true }
# Pinning clap, as newer versions have raised min rustc version without being marked a breaking change
clap = { version = "=4.5.37", optional = true, features = ["derive"] }
notify = { version = "8.1.0", optional = true }
clap = { version = "4.5.41", optional = true, features = ["derive"] }
log = { version = "0.4.22", features = ["std"] }
2 changes: 1 addition & 1 deletion crates/spirv-std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ workspace = true
[dependencies]
spirv-std-types.workspace = true
spirv-std-macros.workspace = true
bitflags = "1.2.1"
bitflags = "1.3.2"
bytemuck = { version = "1.18.0", features = ["derive"], optional = true }

[target.'cfg(target_arch = "spirv")'.dependencies]
Expand Down
39 changes: 2 additions & 37 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ ignore = [
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
[bans]
# Lint level for when multiple versions of the same crate are detected
multiple-versions = "deny"
multiple-versions = "allow"
# Lint level for when a crate version requirement is `*`
wildcards = "allow"
highlight = "all"
Expand All @@ -25,41 +25,6 @@ deny = [
# not specified, all versions will be matched.
#{ name = "ansi_term", version = "=0.11.0" },
]
# Certain crates/versions that will be skipped when doing duplicate detection.
skip = [
#{ name = "ansi_term", version = "=0.11.0" },

# HACK(eddyb) two versions coexist for interop, for the time being.
{ name = "raw-window-handle", version = "=0.5.2" },
{ name = "raw-window-handle", version = "=0.6.2" },

# HACK(eddyb) the newer version hasn't propagated through the ecosystem yet.
{ name = "hashbrown", version = "=0.14.5" },
{ name = "hashbrown", version = "=0.15.2" },

# HACK(eddyb) the newer version hasn't propagated through the ecosystem yet.
{ name = "ndk-sys", version = "=0.5.0+25.2.9519653" },
{ name = "ndk-sys", version = "=0.6.0+11769913" },
]
# Similarly to `skip` allows you to skip certain crates during duplicate
# detection. Unlike skip, it also includes the entire tree of transitive
# dependencies starting at the specified crate, up to a certain depth, which is
# by default infinite
skip-tree = [
# HACK(eddyb) `jni` (an `android-activity` dep) uses older `windows-*`.
{ name = "jni", version = "=0.21.1", depth = 7 },
# HACK(eddyb) `plist` (an `ash-molten` build dep) uses older `quick-xml`.
{ name = "plist", version = "=1.7.0", depth = 2 },
# HACK(eddyb) `minifb` (an `example-runner-cpu` dep) uses older `wayland-*`.
{ name = "minifb", version = "=0.25.0", depth = 3 },
# HACK(eddyb) `num_cpus` (a `tester` dep) uses older `hermit-abi`.
{ name = "num_cpus", version = "=1.16.0", depth = 2 },
# HACK(LegNeato) `tracing-tree` uses newer dependencies of `tracing`.
{ name = "tracing-tree", version = "=0.3.1" },
# HACK(LegNeato) `thorin` has not yet released the version that bumps this.
{ name = "gimli", version = "=0.30.0" },
]




Expand All @@ -85,7 +50,7 @@ exceptions = [
# CC0 is a permissive license but somewhat unclear status for source code
# so we prefer to not have dependencies using it
# https://tldrlegal.com/license/creative-commons-cc0-1.0-universal
{ allow = ["CC0-1.0"], name = "notify", version = "7.0.0" },
{ allow = ["CC0-1.0"], name = "notify" },
{ allow = ["CC0-1.0"], name = "hexf-parse" },
]

Expand Down
2 changes: 1 addition & 1 deletion examples/runners/cpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license.workspace = true
repository.workspace = true

[dependencies]
minifb = "0.25.0"
minifb = "0.28.0"
# bring in the shader as natively compiled code
shared = { path = "../../shaders/shared" }
sky-shader = { path = "../../shaders/sky-shader" }
Expand Down
3 changes: 1 addition & 2 deletions examples/runners/cpu/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,7 @@ fn main() {
mouse_button_press_time: [f32::NEG_INFINITY; 3],
};

// Limit to max ~60 fps update rate
window.limit_update_rate(Some(std::time::Duration::from_micros(16600)));
window.set_target_fps(60);

let start_time = Instant::now();

Expand Down
8 changes: 4 additions & 4 deletions examples/runners/wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ cfg-if = "1.0.0"
shared = { path = "../../shaders/shared" }
futures = { version = "0.3", default-features = false, features = ["std", "executor"] }
# Vulkan SDK or MoltenVK needs to be installed for `vulkan-portability` to work on macOS
wgpu = { version = "25.0.2", features = ["spirv", "vulkan-portability"] }
wgpu = { version = "26.0.1", features = ["spirv", "vulkan-portability"] }
winit = { version = "0.30.0", features = ["android-native-activity", "rwh_05"] }
clap = { version = "4", features = ["derive"] }
strum = { version = "0.26.0", default-features = false, features = ["std", "derive"] }
strum = { version = "0.27.2", default-features = false, features = ["std", "derive"] }
bytemuck = "1.6.3"

[target.'cfg(not(any(target_os = "android", target_arch = "wasm32")))'.dependencies]
env_logger = "0.11.0"
spirv-builder = { workspace = true, features = ["watch"] }

[target.'cfg(target_os = "android")'.dependencies]
android_logger = "0.14.1"
android_logger = "0.15.1"
# NOTE(eddyb) `winit` feature `android-native-activity` is always enabled above,
# to avoid specifying the dependency twice, but only applies to android builds.

[target.'cfg(target_arch = "wasm32")'.dependencies]
web-sys = "0.3.60"
console_error_panic_hook = "0.1.6"
console_log = "0.2.0"
console_log = "1.0.0"
wasm-bindgen-futures = "0.4.18"
1 change: 1 addition & 0 deletions examples/runners/wgpu/src/graphics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,7 @@ async fn run(
label: None,
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
view: &output_view,
depth_slice: None,
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Clear(wgpu::Color::GREEN),
Expand Down
2 changes: 1 addition & 1 deletion tests/compiletests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@ compiletest = { version = "0.11.2", package = "compiletest_rs" }
rustc_codegen_spirv = { workspace = true }
rustc_codegen_spirv-target-specs = { workspace = true, features = ["dir_path"] }
clap = { version = "4", features = ["derive"] }
itertools = "0.10.5"
itertools = "0.14.0"
6 changes: 3 additions & 3 deletions tests/difftests/bin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ tempfile = "3.5"
tester = "0.9.1"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0"
toml = { version = "0.8.20", default-features = false, features = ["parse"] }
thiserror = "2.0.12"
toml = { version = "0.9.2", default-features = false, features = ["parse", "serde"] }
bytesize = "2.0.1"
bytemuck = "1.21.0"
difftest = { path = "../lib" }
tabled = { version = "0.15", default-features = false, features = ["std"] }
tabled = { version = "0.20.0", default-features = false, features = ["std"] }

[lints]
workspace = true
2 changes: 1 addition & 1 deletion tests/difftests/bin/src/differ.rs
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ impl DifferenceDisplay for RawDiffer {
.modify((0, 1), Span::column(3))
.modify((0, 4), Span::column(3))
// Remove the borders between merged cells
.with(tabled::settings::style::BorderSpanCorrection);
.with(tabled::settings::themes::BorderCorrection::span());

let mut result = table.to_string();

Expand Down
4 changes: 2 additions & 2 deletions tests/difftests/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ use-compiled-tools = [
spirv-builder.workspace = true
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
wgpu = { version = "25.0.2", features = ["spirv", "vulkan-portability", "static-dxc"] }
wgpu = { version = "26.0.1", features = ["spirv", "vulkan-portability", "static-dxc"] }
ash = { version = "0.38", default-features = false }
naga = { version = "25.0.1", features = ["glsl-in", "spv-out"] }
naga = { version = "26.0.0", features = ["glsl-in", "spv-out"] }
tempfile = "3.5"
futures = "0.3.31"
bytemuck = "1.21.0"
Expand Down
1 change: 1 addition & 0 deletions tests/difftests/lib/src/scaffold/compute/wgpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ where
#[cfg(not(target_os = "linux"))]
backends: wgpu::Backends::PRIMARY,
flags: Default::default(),
memory_budget_thresholds: Default::default(),
backend_options: wgpu::BackendOptions {
#[cfg(target_os = "windows")]
dx12: wgpu::Dx12BackendOptions {
Expand Down
Loading
Loading