From 65f690b07559a36fe8bfcba31edd851c5c286704 Mon Sep 17 00:00:00 2001
From: Poly <marynczak.bartlomiej@gmail.com>
Date: Wed, 13 Oct 2021 19:40:29 +0200
Subject: Update wgpu to 0.11

---
 wgpu/Cargo.toml               | 4 ++--
 wgpu/src/window/compositor.rs | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml
index 71da889f..ed74b804 100644
--- a/wgpu/Cargo.toml
+++ b/wgpu/Cargo.toml
@@ -27,8 +27,8 @@ default_system_font = ["iced_graphics/font-source"]
 spirv = ["wgpu/spirv"]
 
 [dependencies]
-wgpu = "0.10"
-wgpu_glyph = "0.14"
+wgpu = "0.11"
+wgpu_glyph = "0.15"
 glyph_brush = "0.7"
 raw-window-handle = "0.3"
 log = "0.4"
diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs
index eca54b6f..bd8e1f89 100644
--- a/wgpu/src/window/compositor.rs
+++ b/wgpu/src/window/compositor.rs
@@ -40,6 +40,7 @@ impl Compositor {
                     wgpu::PowerPreference::HighPerformance
                 },
                 compatible_surface: compatible_surface.as_ref(),
+                force_fallback_adapter: false,
             })
             .await?;
 
@@ -141,7 +142,7 @@ impl iced_graphics::window::Compositor for Compositor {
         output: &<Self::Renderer as iced_native::Renderer>::Output,
         overlay: &[T],
     ) -> Result<mouse::Interaction, iced_graphics::window::SurfaceError> {
-        match surface.get_current_frame() {
+        match surface.get_current_texture() {
             Ok(frame) => {
                 let mut encoder = self.device.create_command_encoder(
                     &wgpu::CommandEncoderDescriptor {
@@ -150,7 +151,6 @@ impl iced_graphics::window::Compositor for Compositor {
                 );
 
                 let view = &frame
-                    .output
                     .texture
                     .create_view(&wgpu::TextureViewDescriptor::default());
 
@@ -193,6 +193,7 @@ impl iced_graphics::window::Compositor for Compositor {
                 // Submit work
                 self.staging_belt.finish();
                 self.queue.submit(Some(encoder.finish()));
+                frame.present();
 
                 // Recall staging buffers
                 self.local_pool
-- 
cgit 


From 3a723f6ec118d8a2fb9c17bde84ecfc888ee6c79 Mon Sep 17 00:00:00 2001
From: Paul Delafosse <paul.delafosse@protonmail.com>
Date: Fri, 15 Oct 2021 12:20:46 +0200
Subject: Fix blit shader constants visivility #1083

---
 wgpu/src/shader/blit.wgsl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wgpu')

diff --git a/wgpu/src/shader/blit.wgsl b/wgpu/src/shader/blit.wgsl
index 694f192e..f8f6e2d4 100644
--- a/wgpu/src/shader/blit.wgsl
+++ b/wgpu/src/shader/blit.wgsl
@@ -1,4 +1,4 @@
-var positions: array<vec2<f32>, 6> = array<vec2<f32>, 6>(
+var<private> positions: array<vec2<f32>, 6> = array<vec2<f32>, 6>(
     vec2<f32>(-1.0, 1.0),
     vec2<f32>(-1.0, -1.0),
     vec2<f32>(1.0, -1.0),
@@ -7,7 +7,7 @@ var positions: array<vec2<f32>, 6> = array<vec2<f32>, 6>(
     vec2<f32>(1.0, -1.0)
 );
 
-var uvs: array<vec2<f32>, 6> = array<vec2<f32>, 6>(
+var<private> uvs: array<vec2<f32>, 6> = array<vec2<f32>, 6>(
     vec2<f32>(0.0, 0.0),
     vec2<f32>(0.0, 1.0),
     vec2<f32>(1.0, 1.0),
-- 
cgit