Skip to content

Commit

Permalink
Fix Features when Depending on wgpu (#6915)
Browse files Browse the repository at this point in the history
  • Loading branch information
cwfitzgerald authored Jan 14, 2025
1 parent aa7bec6 commit c71d670
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 11 deletions.
10 changes: 8 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ arrayvec = "0.7"
bincode = "1"
bit-vec = "0.8"
bitflags = "2.7"
bytemuck = { version = "1.21" }
bytemuck = { version = "1.21", features = ["derive", "min_const_generics"] }
cfg_aliases = "0.2.1"
cfg-if = "1"
criterion = "0.5"
Expand Down Expand Up @@ -134,7 +134,13 @@ strum = { version = "0.26.0", features = ["derive"] }
trybuild = "1"
tracy-client = "0.17"
thiserror = "2"
wgpu = { version = "23.0.1", path = "./wgpu", default-features = false }
wgpu = { version = "23.0.1", path = "./wgpu", default-features = false, features = [
"serde",
"wgsl",
"dx12",
"metal",
"static-dxc",
] }
wgpu-core = { version = "23.0.1", path = "./wgpu-core" }
wgpu-macros = { version = "23.0.0", path = "./wgpu-macros" }
wgpu-test = { version = "23.0.0", path = "./tests" }
Expand Down
2 changes: 1 addition & 1 deletion benches/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ pollster.workspace = true
profiling.workspace = true
rayon.workspace = true
tracy-client = { workspace = true, optional = true }
wgpu = { workspace = true, features = ["wgsl", "metal", "dx12"] }
wgpu.workspace = true
8 changes: 2 additions & 6 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ webgl = ["wgpu/webgl"]
webgpu = ["wgpu/webgpu"]

[dependencies]
bytemuck = { workspace = true, features = ["derive"] }
bytemuck.workspace = true
cfg-if.workspace = true
encase = { workspace = true, features = ["glam"] }
flume.workspace = true
Expand All @@ -43,11 +43,7 @@ obj.workspace = true
png.workspace = true
pollster.workspace = true
web-time.workspace = true
wgpu = { workspace = true, default-features = false, features = [
"wgsl",
"dx12",
"metal",
] }
wgpu.workspace = true
winit.workspace = true

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ serde_json.workspace = true
serde.workspace = true
strum = { workspace = true, features = ["derive"] }
trybuild.workspace = true
wgpu = { workspace = true, features = ["wgsl", "static-dxc"] }
wgpu.workspace = true
wgpu-macros.workspace = true
wgt = { workspace = true, features = ["serde"] }

Expand Down
2 changes: 1 addition & 1 deletion wgpu-info/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ env_logger.workspace = true
pico-args.workspace = true
serde = { workspace = true, features = ["default"] }
serde_json.workspace = true
wgpu = { workspace = true, features = ["serde", "dx12", "metal", "static-dxc"] }
wgpu.workspace = true

0 comments on commit c71d670

Please sign in to comment.