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
123 changes: 58 additions & 65 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions 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 = "25.0.2" }
wgpu = { version = "26.0.1" }
log = "0.4.27"
image = { version = "0.25.6", default-features = false }

Expand All @@ -136,7 +136,7 @@ clap = "4.5.38"
anyhow = "1.0.98"
pollster = "0.4.0"
web-time = "1.1.0"
wgpu-profiler = "0.23.0"
wgpu-profiler = "0.24.0"
winit = "0.30.10"
scenes = { path = "examples/scenes" }
svg = "0.18.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,12 @@ impl RenderContext {
pub(crate) fn new() -> Self {
let backends = wgpu::Backends::from_env().unwrap_or_default();
let flags = wgpu::InstanceFlags::from_build_config().with_env();
let memory_budget_thresholds = wgpu::MemoryBudgetThresholds::default();
let backend_options = wgpu::BackendOptions::from_env_or_default();
let instance = Instance::new(&wgpu::InstanceDescriptor {
backends,
flags,
memory_budget_thresholds,
backend_options,
});
Self {
Expand Down
2 changes: 2 additions & 0 deletions sparse_strips/vello_hybrid/src/render/wgpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1065,6 +1065,7 @@ impl RendererContext<'_> {
} else {
&self.programs.resources.slot_texture_views[ix]
},
depth_slice: None,
resolve_target: None,
ops: wgpu::Operations {
load,
Expand Down Expand Up @@ -1111,6 +1112,7 @@ impl RendererContext<'_> {
label: Some("Clear Slots Render Pass"),
color_attachments: &[Some(RenderPassColorAttachment {
view: &resources.slot_texture_views[ix],
depth_slice: None,
resolve_target: None,
ops: wgpu::Operations {
// Don't clear the entire texture, just specific slots
Expand Down
4 changes: 2 additions & 2 deletions sparse_strips/vello_sparse_shaders/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ default-target = "x86_64-unknown-linux-gnu"
targets = []

[dependencies]
naga = { version = "25.0.1", features = ["wgsl-in", "glsl-out"], optional = true }
naga = { version = "26.0.0", features = ["wgsl-in", "glsl-out"], optional = true }

[build-dependencies]
naga = { version = "25.0.1", features = ["wgsl-in", "glsl-out"], optional = true }
naga = { version = "26.0.0", features = ["wgsl-in", "glsl-out"], optional = true }

[features]
glsl = ["dep:naga"]
Expand Down
2 changes: 2 additions & 0 deletions vello/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,12 @@ impl RenderContext {
pub fn new() -> Self {
let backends = wgpu::Backends::from_env().unwrap_or_default();
let flags = wgpu::InstanceFlags::from_build_config().with_env();
let memory_budget_thresholds = wgpu::MemoryBudgetThresholds::default();
let backend_options = wgpu::BackendOptions::from_env_or_default();
let instance = Instance::new(&wgpu::InstanceDescriptor {
backends,
flags,
memory_budget_thresholds,
backend_options,
});
Self {
Expand Down
1 change: 1 addition & 0 deletions vello/src/wgpu_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ impl WgpuEngine {
label: None,
color_attachments: &[Some(wgpu::RenderPassColorAttachment {
view: render_target,
depth_slice: None,
resolve_target: None,
ops: wgpu::Operations {
load: match draw_params.clear_color {
Expand Down
Loading
Loading