Skip to content

Commit

Permalink
Remove block dependency, update naga
Browse files Browse the repository at this point in the history
  • Loading branch information
kvark committed Dec 21, 2024
1 parent e445a7a commit b170b07
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ glam = { version = "0.28", features = ["mint"] }
gltf = { version = "1.1", default-features = false }
log = "0.4"
mint = "0.5"
naga = { git = "https://github.com/gfx-rs/wgpu", rev = "1a643291c2e8854ba7e4f5445a4388202731bfa1", features = [
"wgsl-in",
] }
naga = { version = "23.1.0", features = ["wgsl-in"] }
profiling = "1"
slab = "0.4"
strum = { version = "0.25", features = ["derive"] }
Expand Down Expand Up @@ -90,11 +88,15 @@ del-geo = "=0.1.29"

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
# see https://github.com/emilk/egui/issues/4270
egui-winit = { version="0.29", default-features=false, features=["links"] }
egui-winit = { version = "0.29", default-features = false, features = [
"links",
] }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
# see https://github.com/emilk/egui/issues/4270
egui-winit = { version="0.29", default-features=false, features=["links"] }
egui-winit = { version = "0.29", default-features = false, features = [
"links",
] }
console_error_panic_hook = "0.1.7"
console_log = "1"
web-sys = { workspace = true, features = ["Window"] }
Expand Down
1 change: 0 additions & 1 deletion blade-graphics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ naga = { workspace = true }
raw-window-handle = "0.6"

[target.'cfg(any(target_os = "ios", target_os = "macos"))'.dependencies]
block = "0.1"
objc2 = "0.5"
objc2-foundation = { version = "0.2", features = ["NSArray"] }
objc2-metal = { version = "0.2", features = [
Expand Down
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Changelog for Blade
- ability to capture pass GPU timings
- ability to force the use of a specific GPU
- Metal:
- migrate to "objc2"
- support for workgroup memory
- concurrent compute dispatches
- Egl:
Expand Down

0 comments on commit b170b07

Please sign in to comment.