Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ vello_hybrid_scenes = { path = "sparse_strips/vello_hybrid/examples/scenes" }
vello_dev_macros = { path = "sparse_strips/vello_dev_macros" }

# NOTE: Make sure to keep this in sync with the version badge in README.md and vello/README.md
wgpu = { version = "26.0.1" }
wgpu = { version = "26.0.1", default-features = false, features = ["std", "wgsl"] }
log = "0.4.27"
image = { version = "0.25.6", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion sparse_strips/vello_cpu/examples/wasm_cpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ web-sys = { version = "0.3.77", features = [
"KeyboardEvent",
"CanvasRenderingContext2d",
] }
wgpu = { workspace = true, features = ["webgl"] }
wgpu = { workspace = true, features = ["webgl"], default-features = true }

[target.'cfg(target_arch = "wasm32")'.dependencies]
parley = { version = "0.5.0", default-features = false, features = ["std"] }
Expand Down
5 changes: 3 additions & 2 deletions sparse_strips/vello_hybrid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ workspace = true
bytemuck = { workspace = true, features = ["derive"] }
thiserror = { workspace = true }
vello_common = { workspace = true, features = ["std", "text"] }
wgpu = { workspace = true, optional = true }
wgpu = { workspace = true, default-features = false, optional = true }
vello_sparse_shaders = { workspace = true, optional = true }
log = { workspace = true }
guillotiere = "0.6.2"
Expand Down Expand Up @@ -51,7 +51,8 @@ vello_common = { workspace = true, features = ["pico_svg"] }
roxmltree = "0.20.0"

[features]
default = ["wgpu"]
default = ["wgpu", "wgpu/default"]
Comment thread
StT191 marked this conversation as resolved.
Outdated
Comment thread
DJMcNab marked this conversation as resolved.
Outdated
std = ["wgpu", "vello_common/std"]
wgpu = ["dep:wgpu", "dep:vello_sparse_shaders"]
wgpu_default = ["wgpu", "wgpu/default"]
webgl = ["dep:js-sys", "dep:web-sys", "dep:vello_sparse_shaders", "vello_sparse_shaders/glsl"]
2 changes: 1 addition & 1 deletion sparse_strips/vello_hybrid/examples/wgpu_webgl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ web-sys = { version = "0.3.77", features = [
"WheelEvent",
"KeyboardEvent",
] }
wgpu = { workspace = true, features = ["webgl"] }
wgpu = { workspace = true, default-features = true, features = ["webgl"] }

[dev-dependencies]
wasm-bindgen-test = "0.3.50"
2 changes: 1 addition & 1 deletion sparse_strips/vello_hybrid/examples/winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ workspace = true

[dependencies]
winit = { workspace = true }
wgpu = { workspace = true }
wgpu = { workspace = true, default-features = true }
vello_common = { workspace = true }
vello_hybrid = { workspace = true }
vello_hybrid_scenes = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion sparse_strips/vello_sparse_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ vello_api = { workspace = true }
vello_common = { workspace = true, features = ["std"] }
vello_cpu = { workspace = true, features = ["multithreading", "std"] }
vello_hybrid = { workspace = true }
wgpu = { workspace = true }
wgpu = { workspace = true, default-features = true }
pollster = { workspace = true }
vello_dev_macros = { workspace = true }
bytemuck = { workspace = true }
Expand Down
5 changes: 3 additions & 2 deletions vello/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ default-target = "x86_64-unknown-linux-gnu"
targets = []

[features]
default = ["wgpu"]
default = ["wgpu", "wgpu_default"]
# Enables GPU memory usage estimation. This performs additional computations
# in order to estimate the minimum required allocations for buffers backing
# bump-allocated GPU memory.
# TODO: Turn this into a runtime option used at resolve time and remove the feature.
bump_estimate = ["vello_encoding/bump_estimate"]
wgpu = ["dep:wgpu", "dep:vello_shaders", "dep:futures-intrusive"]
wgpu_default = ["wgpu", "wgpu/default"]
Comment thread
StT191 marked this conversation as resolved.

# Development only features

Expand All @@ -46,7 +47,7 @@ vello_shaders = { workspace = true, optional = true }
bytemuck = { workspace = true }
skrifa = { workspace = true, features = ["std"] }
peniko = { workspace = true, default-features = true }
wgpu = { workspace = true, optional = true }
wgpu = { workspace = true, default-features = false, optional = true }
log = { workspace = true }
static_assertions = { workspace = true }
futures-intrusive = { workspace = true, optional = true }
Expand Down
8 changes: 8 additions & 0 deletions vello/src/wgpu_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -769,7 +769,15 @@ impl WgpuEngine {
for id in free_images {
if let Some((texture, view)) = self.bind_map.image_map.remove(&id) {
// TODO: have a pool to avoid needless re-allocation
#[allow(
clippy::drop_non_drop,
reason = "suppress warning when no wgpu backend is enabled"
)]
drop(texture);
#[allow(
clippy::drop_non_drop,
reason = "suppress warning when no wgpu backend is enabled"
)]
drop(view);
Comment thread
StT191 marked this conversation as resolved.
Outdated
}
}
Expand Down
Loading