From 3c7789cd3b584874456b440d7828ec57442e91ff Mon Sep 17 00:00:00 2001
From: grovesNL <josh@joshgroves.com>
Date: Wed, 13 Jul 2022 09:34:49 -0230
Subject: [PATCH] Update to wgpu 0.13

---
 Cargo.toml              | 2 +-
 examples/hello-world.rs | 6 +++---
 src/lib.rs              | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6b007b6..cee7ffe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ repository = "https://github.com/grovesNL/glyphon"
 license = "MIT OR Apache-2.0 OR Zlib"
 
 [dependencies]
-wgpu = { git = "https://github.com/gfx-rs/wgpu", rev = "8e62ca0" }
+wgpu = "0.13.1"
 fontdue = "0.7.2"
 etagere = "0.2.6"
 
diff --git a/examples/hello-world.rs b/examples/hello-world.rs
index 064730a..b66c9ed 100644
--- a/examples/hello-world.rs
+++ b/examples/hello-world.rs
@@ -56,7 +56,7 @@ async fn run() {
     let window = Window::new(&event_loop).unwrap();
     let surface = unsafe { instance.create_surface(&window) };
     let size = window.inner_size();
-    let swapchain_format = surface.get_preferred_format(&adapter).unwrap();
+    let swapchain_format = surface.get_supported_formats(&adapter)[0];
     let mut config = SurfaceConfiguration {
         usage: TextureUsages::RENDER_ATTACHMENT,
         format: swapchain_format,
@@ -127,14 +127,14 @@ async fn run() {
                 {
                     let mut pass = encoder.begin_render_pass(&RenderPassDescriptor {
                         label: None,
-                        color_attachments: &[RenderPassColorAttachment {
+                        color_attachments: &[Some(RenderPassColorAttachment {
                             view: &view,
                             resolve_target: None,
                             ops: Operations {
                                 load: LoadOp::Clear(wgpu::Color::BLACK),
                                 store: true,
                             },
-                        }],
+                        })],
                         depth_stencil_attachment: None,
                     });
 
diff --git a/src/lib.rs b/src/lib.rs
index 91a9e82..bc8bac5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -170,7 +170,7 @@ impl TextAtlas {
         let glyph_cache = RecentlyUsedMap::new();
 
         // Create a render pipeline to use for rendering later
-        let shader = device.create_shader_module(&ShaderModuleDescriptor {
+        let shader = device.create_shader_module(ShaderModuleDescriptor {
             label: Some("glyphon shader"),
             source: ShaderSource::Wgsl(Cow::Borrowed(include_str!("shader.wgsl"))),
         });
@@ -285,11 +285,11 @@ impl TextAtlas {
             fragment: Some(FragmentState {
                 module: &shader,
                 entry_point: "fs_main",
-                targets: &[ColorTargetState {
+                targets: &[Some(ColorTargetState {
                     format,
                     blend: Some(BlendState::PREMULTIPLIED_ALPHA_BLENDING),
                     write_mask: ColorWrites::default(),
-                }],
+                })],
             }),
             primitive: PrimitiveState::default(),
             depth_stencil: None,