diff options
Diffstat (limited to '')
| -rw-r--r-- | examples/integration_wgpu/src/main.rs | 3 | ||||
| -rw-r--r-- | wgpu/Cargo.toml | 4 | ||||
| -rw-r--r-- | wgpu/src/image/atlas.rs | 4 | ||||
| -rw-r--r-- | wgpu/src/window/compositor.rs | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/examples/integration_wgpu/src/main.rs b/examples/integration_wgpu/src/main.rs index 3ac458b3..7b9f4d4c 100644 --- a/examples/integration_wgpu/src/main.rs +++ b/examples/integration_wgpu/src/main.rs @@ -72,7 +72,6 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> { backends: backend, ..Default::default() }); - let surface = unsafe { instance.create_surface(&window) }?; let (format, (device, queue)) = futures::executor::block_on(async { @@ -99,7 +98,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> { capabilities .formats .iter() - .filter(|format| format.describe().srgb) + .filter(|format| format.is_srgb()) .copied() .next() .or_else(|| capabilities.formats.first().copied()) diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index 3478ef59..1ce07e0a 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -28,8 +28,8 @@ spirv = ["wgpu/spirv"] webgl = ["wgpu/webgl"] [dependencies] -wgpu = "0.15" -wgpu_glyph = "0.19" +wgpu = "0.16" +wgpu_glyph = "0.20" glyph_brush = "0.7" raw-window-handle = "0.5" log = "0.4" diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs index 82504147..1384949a 100644 --- a/wgpu/src/image/atlas.rs +++ b/wgpu/src/image/atlas.rs @@ -209,8 +209,8 @@ impl Atlas { buffer, layout: wgpu::ImageDataLayout { offset: offset as u64, - bytes_per_row: NonZeroU32::new(4 * image_width + padding), - rows_per_image: NonZeroU32::new(image_height), + bytes_per_row: Some(4 * image_width + padding), + rows_per_image: Some(image_height), }, }, wgpu::ImageCopyTexture { diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index d4a59471..8969ad6c 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -71,7 +71,7 @@ impl<Theme> Compositor<Theme> { capabilities .formats .iter() - .filter(|format| format.describe().srgb) + .filter(|format| format.is_srgb()) .copied() .next() .or_else(|| { |