Use GLib instead of another local executor

valpackett · Nov 13, 2020 · 897c089 · 897c089
1 parent 20d49fc
commit 897c089
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
@@ -20,6 +20,7 @@ raw-window-handle = "0.3"
 log = "0.4"
 guillotiere = "0.6"
 futures = "0.3"
+glib = "0"
 
 [dependencies.bytemuck]
 version = "1.4"

diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
@@ -12,7 +12,6 @@ pub struct Compositor {
     device: wgpu::Device,
     queue: wgpu::Queue,
     staging_belt: wgpu::util::StagingBelt,
-    local_pool: futures::executor::LocalPool,
 }
 
 impl Compositor {
@@ -54,15 +53,13 @@ impl Compositor {
             .ok()?;
 
         let staging_belt = wgpu::util::StagingBelt::new(Self::CHUNK_SIZE);
-        let local_pool = futures::executor::LocalPool::new();
 
         Some(Compositor {
             instance,
             settings,
             device,
             queue,
             staging_belt,
-            local_pool,
         })
     }
 
@@ -171,12 +168,7 @@ impl iced_graphics::window::Compositor for Compositor {
         self.queue.submit(Some(encoder.finish()));
 
         // Recall staging buffers
-        self.local_pool
-            .spawner()
-            .spawn(self.staging_belt.recall())
-            .expect("Recall staging belt");
-
-        self.local_pool.run_until_stalled();
+        glib::MainContext::default().spawn(self.staging_belt.recall());
 
         mouse_interaction
     }