summaryrefslogtreecommitdiffstats
path: root/examples/integration/src/main.rs
diff options
context:
space:
mode:
authorLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-08-27 14:55:41 +0200
committerLibravatar Héctor Ramón Jiménez <hector0193@gmail.com>2020-08-27 14:55:41 +0200
commitbae0a3e46e6f4f21ef8c6c8e9035efb7c87a9449 (patch)
tree2f2784514c13978158dd2de062fea61c9f64f9f3 /examples/integration/src/main.rs
parentbb5f034e08c46e5ce46ed0e38a684c5ca710cb11 (diff)
downloadiced-bae0a3e46e6f4f21ef8c6c8e9035efb7c87a9449.tar.gz
iced-bae0a3e46e6f4f21ef8c6c8e9035efb7c87a9449.tar.bz2
iced-bae0a3e46e6f4f21ef8c6c8e9035efb7c87a9449.zip
Update `wgpu` in `integration` example
Diffstat (limited to '')
-rw-r--r--examples/integration/src/main.rs54
1 files changed, 36 insertions, 18 deletions
diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs
index 33d4c361..9b52f3a5 100644
--- a/examples/integration/src/main.rs
+++ b/examples/integration/src/main.rs
@@ -7,6 +7,7 @@ use scene::Scene;
use iced_wgpu::{wgpu, Backend, Renderer, Settings, Viewport};
use iced_winit::{conversion, futures, program, winit, Debug, Size};
+use futures::task::SpawnExt;
use winit::{
dpi::PhysicalPosition,
event::{Event, ModifiersState, WindowEvent},
@@ -29,26 +30,29 @@ pub fn main() {
let mut modifiers = ModifiersState::default();
// Initialize wgpu
- let surface = wgpu::Surface::create(&window);
+ let instance = wgpu::Instance::new(wgpu::BackendBit::PRIMARY);
+ let surface = unsafe { instance.create_surface(&window) };
+
let (mut device, queue) = futures::executor::block_on(async {
- let adapter = wgpu::Adapter::request(
- &wgpu::RequestAdapterOptions {
+ let adapter = instance
+ .request_adapter(&wgpu::RequestAdapterOptions {
power_preference: wgpu::PowerPreference::Default,
compatible_surface: Some(&surface),
- },
- wgpu::BackendBit::PRIMARY,
- )
- .await
- .expect("Request adapter");
+ })
+ .await
+ .expect("Request adapter");
adapter
- .request_device(&wgpu::DeviceDescriptor {
- extensions: wgpu::Extensions {
- anisotropic_filtering: false,
+ .request_device(
+ &wgpu::DeviceDescriptor {
+ features: wgpu::Features::empty(),
+ limits: wgpu::Limits::default(),
+ shader_validation: false,
},
- limits: wgpu::Limits::default(),
- })
+ None,
+ )
.await
+ .expect("Request device")
});
let format = wgpu::TextureFormat::Bgra8UnormSrgb;
@@ -69,6 +73,10 @@ pub fn main() {
};
let mut resized = false;
+ // Initialize staging belt and local pool
+ let mut staging_belt = wgpu::util::StagingBelt::new(5 * 1024);
+ let mut local_pool = futures::executor::LocalPool::new();
+
// Initialize scene and GUI controls
let scene = Scene::new(&mut device);
let controls = Controls::new();
@@ -160,7 +168,7 @@ pub fn main() {
resized = false;
}
- let frame = swap_chain.get_next_texture().expect("Next frame");
+ let frame = swap_chain.get_current_frame().expect("Next frame");
let mut encoder = device.create_command_encoder(
&wgpu::CommandEncoderDescriptor { label: None },
@@ -171,7 +179,7 @@ pub fn main() {
{
// We clear the frame
let mut render_pass = scene.clear(
- &frame.view,
+ &frame.output.view,
&mut encoder,
program.background_color(),
);
@@ -183,22 +191,32 @@ pub fn main() {
// And then iced on top
let mouse_interaction = renderer.backend_mut().draw(
&mut device,
+ &mut staging_belt,
&mut encoder,
- &frame.view,
+ &frame.output.view,
&viewport,
state.primitive(),
&debug.overlay(),
);
// Then we submit the work
- queue.submit(&[encoder.finish()]);
+ staging_belt.finish();
+ queue.submit(Some(encoder.finish()));
- // And update the mouse cursor
+ // Update the mouse cursor
window.set_cursor_icon(
iced_winit::conversion::mouse_interaction(
mouse_interaction,
),
);
+
+ // And recall staging buffers
+ local_pool
+ .spawner()
+ .spawn(staging_belt.recall())
+ .expect("Recall staging buffers");
+
+ local_pool.run_until_stalled();
}
_ => {}
}