diff options
Diffstat (limited to 'wgpu/src')
| -rw-r--r-- | wgpu/src/image/atlas.rs | 6 | ||||
| -rw-r--r-- | wgpu/src/window/compositor.rs | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/wgpu/src/image/atlas.rs b/wgpu/src/image/atlas.rs index 39b6e5d2..366fe623 100644 --- a/wgpu/src/image/atlas.rs +++ b/wgpu/src/image/atlas.rs @@ -14,8 +14,6 @@ pub const SIZE: u32 = 2048; use crate::core::Size; -use std::num::NonZeroU32; - #[derive(Debug)] pub struct Atlas { texture: wgpu::Texture, @@ -308,8 +306,8 @@ impl Atlas { data, 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), }, extent, ); diff --git a/wgpu/src/window/compositor.rs b/wgpu/src/window/compositor.rs index c55ffa46..500458e8 100644 --- a/wgpu/src/window/compositor.rs +++ b/wgpu/src/window/compositor.rs @@ -72,9 +72,8 @@ impl<Theme> Compositor<Theme> { capabilities .formats .iter() - .filter(|format| format.describe().srgb) .copied() - .next() + .find(wgpu::TextureFormat::is_srgb) .or_else(|| { log::warn!("No sRGB format found!"); |