From 80e8465af6a1e6896ff45de715212568ccdef47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?=
 <hector0193@gmail.com>
Date: Tue, 2 May 2023 06:31:22 +0200
Subject: [PATCH] Update `wgpu` to `0.16`

---
 Cargo.toml         | 2 +-
 src/shader.wgsl    | 2 +-
 src/text_render.rs | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 84193fc..50f8481 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 = "0.15"
+wgpu = "0.16"
 etagere = "0.2.6"
 cosmic-text = "0.8"
 lru = "0.9"
diff --git a/src/shader.wgsl b/src/shader.wgsl
index bcb03ec..b60c8b6 100644
--- a/src/shader.wgsl
+++ b/src/shader.wgsl
@@ -76,7 +76,7 @@ fn vs_main(in_vert: VertexInput) -> VertexOutput {
         f32((color & 0xff000000u) >> 24u),
     ) / 255.0;
 
-    var dim = vec2<u32>(0);
+    var dim: vec2<u32> = vec2(0u);
     switch in_vert.content_type {
         case 0u: {
             dim = textureDimensions(color_atlas_texture);
diff --git a/src/text_render.rs b/src/text_render.rs
index 32298c3..413e960 100644
--- a/src/text_render.rs
+++ b/src/text_render.rs
@@ -2,7 +2,7 @@ use crate::{
     CacheKey, FontSystem, GlyphDetails, GlyphToRender, GpuCacheStatus, Params, PrepareError,
     RenderError, Resolution, SwashCache, SwashContent, TextArea, TextAtlas,
 };
-use std::{collections::HashSet, iter, mem::size_of, num::NonZeroU32, slice, sync::Arc};
+use std::{collections::HashSet, iter, mem::size_of, slice, sync::Arc};
 use wgpu::{
     Buffer, BufferDescriptor, BufferUsages, DepthStencilState, Device, Extent3d, ImageCopyTexture,
     ImageDataLayout, IndexFormat, MultisampleState, Origin3d, Queue, RenderPass, RenderPipeline,
@@ -147,9 +147,7 @@ impl TextRenderer {
                             &image.data,
                             ImageDataLayout {
                                 offset: 0,
-                                bytes_per_row: NonZeroU32::new(
-                                    width as u32 * inner.num_atlas_channels as u32,
-                                ),
+                                bytes_per_row: Some(width as u32 * inner.num_atlas_channels as u32),
                                 rows_per_image: None,
                             },
                             Extent3d {