Skip to content

Commit

Permalink
Merge branch 'master' into text-editor
Browse files Browse the repository at this point in the history
  • Loading branch information
hecrj committed Oct 27, 2023
2 parents 57f9024 + 8e6f131 commit 1b534bd
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 9 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ iced_winit = { version = "0.12", path = "winit" }
async-std = "1.0"
bitflags = "1.0"
bytemuck = { version = "1.0", features = ["derive"] }
cosmic-text = { git = "https://github.com/pop-os/cosmic-text.git", rev = "30398c2f0cb79267d440870bc47967579e31a2ae" }
cosmic-text = "0.10"
futures = "0.3"
glam = "0.24"
glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "0a8366be5ec6d48c3e10c996ba840936992d878f" }
glyphon = { git = "https://github.com/hecrj/glyphon.git", rev = "2caa9fc5e5923c1d827d177c3619cab7e9885b85" }
guillotiere = "0.6"
half = "2.2"
image = "0.24"
Expand Down Expand Up @@ -155,7 +155,7 @@ unicode-segmentation = "1.0"
wasm-bindgen-futures = "0.4"
wasm-timer = "0.2"
web-sys = "0.3"
wgpu = "0.17"
wgpu = "0.18"
winapi = "0.3"
window_clipboard = "0.3"
winit = { git = "https://github.com/iced-rs/winit.git", rev = "c52db2045d0a2f1b8d9923870de1d4ab1994146e", default-features = false }
4 changes: 3 additions & 1 deletion examples/integration/src/scene.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ impl Scene {
a: a as f64,
}
}),
store: true,
store: wgpu::StoreOp::Store,
},
})],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
})
}

Expand Down
8 changes: 6 additions & 2 deletions wgpu/src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,12 @@ impl Backend {
}),
None => wgpu::LoadOp::Load,
},
store: true,
store: wgpu::StoreOp::Store,
},
})],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
},
));

Expand Down Expand Up @@ -270,11 +272,13 @@ impl Backend {
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Load,
store: true,
store: wgpu::StoreOp::Store,
},
},
)],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
},
));
}
Expand Down
4 changes: 3 additions & 1 deletion wgpu/src/color.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,12 @@ pub fn convert(
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Load,
store: true,
store: wgpu::StoreOp::Store,
},
})],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
});

pass.set_pipeline(&pipeline);
Expand Down
7 changes: 6 additions & 1 deletion wgpu/src/triangle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,10 +300,15 @@ impl Pipeline {
wgpu::RenderPassColorAttachment {
view: attachment,
resolve_target,
ops: wgpu::Operations { load, store: true },
ops: wgpu::Operations {
load,
store: wgpu::StoreOp::Store,
},
},
)],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
});

let layer = &mut self.layers[layer];
Expand Down
4 changes: 3 additions & 1 deletion wgpu/src/triangle/msaa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,12 @@ impl Blit {
resolve_target: None,
ops: wgpu::Operations {
load: wgpu::LoadOp::Load,
store: true,
store: wgpu::StoreOp::Store,
},
})],
depth_stencil_attachment: None,
timestamp_writes: None,
occlusion_query_set: None,
});

render_pass.set_pipeline(&self.pipeline);
Expand Down

0 comments on commit 1b534bd

Please sign in to comment.