Merge pull request #101 from Davidster/wgpu_16

Wgpu 0.16
hecrj · Apr 21, 2023 · 140c0e6 · 140c0e6
2 parents c1fd584 + dd46e46
commit 140c0e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,7 +11,7 @@ documentation = "https://docs.rs/wgpu_glyph"
 readme = "README.md"
 
 [dependencies]
-wgpu = "0.15"
+wgpu = "0.16"
 glyph_brush = "0.7"
 log = "0.4"
 

diff --git a/src/pipeline/cache.rs b/src/pipeline/cache.rs
@@ -1,5 +1,4 @@
 use core::num::NonZeroU64;
-use std::num::NonZeroU32;
 
 pub struct Cache {
     texture: wgpu::Texture,
@@ -100,8 +99,8 @@ impl Cache {
                 buffer: &self.upload_buffer,
                 layout: wgpu::ImageDataLayout {
                     offset: 0,
-                    bytes_per_row: NonZeroU32::new(padded_width as u32),
-                    rows_per_image: NonZeroU32::new(height as u32),
+                    bytes_per_row: Some(padded_width as u32),
+                    rows_per_image: Some(height as u32),
                 },
             },
             wgpu::ImageCopyTexture {