Make Buffer::width/height return u32 instead of NonZeroU32

madsmtm · madsmtm · commit 907f15fdb665 · 2026-01-17T10:06:32.000+01:00
diff --git a/README.md b/README.md
@@ -110,9 +110,9 @@ fn main() {
                     .unwrap();
 
                 let mut buffer = surface.buffer_mut().unwrap();
-                for index in 0..(buffer.width().get() * buffer.height().get()) {
-                    let y = index / buffer.width().get();
-                    let x = index % buffer.width().get();
+                for index in 0..(buffer.width() * buffer.height()) {
+                    let y = index / buffer.width();
+                    let x = index % buffer.width();
                     let red = x % 255;
                     let green = y % 255;
                     let blue = (x * y) % 255;
diff --git a/examples/animation.rs b/examples/animation.rs
@@ -62,7 +62,7 @@ fn main() {
 
                 let mut buffer = surface.buffer_mut().unwrap();
 
-                let size = (buffer.width().get(), buffer.height().get());
+                let size = (buffer.width(), buffer.height());
                 if size != *old_size {
                     *old_size = size;
                     *frames = pre_render_frames(size.0, size.1);
diff --git a/examples/raytracing/game.rs b/examples/raytracing/game.rs
@@ -65,8 +65,8 @@ impl Game {
         // https://github.com/rust-windowing/softbuffer/issues/177
         let scale_factor = scale_factor * 4.0;
 
-        let width = buffer.width().get() as f32 / scale_factor;
-        let height = buffer.height().get() as f32 / scale_factor;
+        let width = buffer.width() as f32 / scale_factor;
+        let height = buffer.height() as f32 / scale_factor;
 
         let dist_to_focus = 10.0;
         let aperture = 0.1;
@@ -117,7 +117,7 @@ impl Game {
         }
 
         // Upscale by `scale_factor`.
-        let width = buffer.width().get() as usize;
+        let width = buffer.width() as usize;
         buffer.iter_mut().enumerate().for_each(|(i, pixel)| {
             let y = i % width;
             let x = i / width;
@@ -143,8 +143,8 @@ impl Game {
             color: u32,
         }
 
-        let width = buffer.width().get() as f32 / scale_factor;
-        let height = buffer.height().get() as f32 / scale_factor;
+        let width = buffer.width() as f32 / scale_factor;
+        let height = buffer.height() as f32 / scale_factor;
         let rects = &[
             Rect {
                 left: 10.0,
@@ -162,7 +162,7 @@ impl Game {
             },
         ];
 
-        let width = buffer.width().get();
+        let width = buffer.width();
         for (y, row) in buffer.chunks_exact_mut(width as usize).enumerate() {
             for rect in rects {
                 let rect_vertical =
diff --git a/examples/rectangle.rs b/examples/rectangle.rs
@@ -8,8 +8,8 @@ use winit::keyboard::{Key, NamedKey};
 mod util;
 
 fn redraw(buffer: &mut Buffer<'_, impl HasDisplayHandle, impl HasWindowHandle>, flag: bool) {
-    let width = buffer.width().get();
-    let height = buffer.height().get();
+    let width = buffer.width();
+    let height = buffer.height();
     for y in 0..height {
         for x in 0..width {
             let value = if flag && x >= 100 && x < width - 100 && y >= 100 && y < height - 100 {
diff --git a/examples/winit.rs b/examples/winit.rs
@@ -46,12 +46,12 @@ pub(crate) fn entry(event_loop: EventLoop<()>) {
                 };
 
                 let mut buffer = surface.buffer_mut().unwrap();
-                for y in 0..buffer.height().get() {
-                    for x in 0..buffer.width().get() {
+                for y in 0..buffer.height() {
+                    for x in 0..buffer.width() {
                         let red = x % 255;
                         let green = y % 255;
                         let blue = (x * y) % 255;
-                        let index = y * buffer.width().get() + x;
+                        let index = y * buffer.width() + x;
                         buffer[index as usize] = blue | (green << 8) | (red << 16);
                     }
                 }
diff --git a/examples/winit_multithread.rs b/examples/winit_multithread.rs
@@ -32,12 +32,12 @@ pub mod ex {
             surface.resize(width, height).unwrap();
 
             let mut buffer = surface.buffer_mut().unwrap();
-            for y in 0..buffer.height().get() {
-                for x in 0..buffer.width().get() {
+            for y in 0..buffer.height() {
+                for x in 0..buffer.width() {
                     let red = x % 255;
                     let green = y % 255;
                     let blue = (x * y) % 255;
-                    let index = y * buffer.width().get() + x;
+                    let index = y * buffer.width() + x;
                     buffer[index as usize] = blue | (green << 8) | (red << 16);
                 }
             }
diff --git a/examples/winit_wrong_sized_buffer.rs b/examples/winit_wrong_sized_buffer.rs
@@ -37,8 +37,8 @@ fn main() {
                 };
 
                 let mut buffer = surface.buffer_mut().unwrap();
-                let width = buffer.width().get();
-                for y in 0..buffer.height().get() {
+                let width = buffer.width();
+                for y in 0..buffer.height() {
                     for x in 0..width {
                         let red = x % 255;
                         let green = y % 255;
diff --git a/src/backend_dispatch.rs b/src/backend_dispatch.rs
@@ -147,7 +147,7 @@ macro_rules! make_dispatch {
 
         impl<'a, D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferDispatch<'a, D, W> {
             #[inline]
-            fn width(&self) -> NonZeroU32 {
+            fn width(&self) -> u32 {
                 match self {
                     $(
                         $(#[$attr])*
@@ -157,7 +157,7 @@ macro_rules! make_dispatch {
             }
 
             #[inline]
-            fn height(&self) -> NonZeroU32 {
+            fn height(&self) -> u32 {
                 match self {
                     $(
                         $(#[$attr])*
diff --git a/src/backend_interface.rs b/src/backend_interface.rs
@@ -35,8 +35,8 @@ pub(crate) trait SurfaceInterface<D: HasDisplayHandle + ?Sized, W: HasWindowHand
 }
 
 pub(crate) trait BufferInterface {
-    fn width(&self) -> NonZeroU32;
-    fn height(&self) -> NonZeroU32;
+    fn width(&self) -> u32;
+    fn height(&self) -> u32;
     fn pixels(&self) -> &[u32];
     fn pixels_mut(&mut self) -> &mut [u32];
     fn age(&self) -> u8;
diff --git a/src/backends/android.rs b/src/backends/android.rs
@@ -125,12 +125,12 @@ pub struct BufferImpl<'a, D: ?Sized, W> {
 unsafe impl<'a, D, W> Send for BufferImpl<'a, D, W> {}
 
 impl<'a, D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferImpl<'a, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.native_window_buffer.width() as u32).unwrap()
+    fn width(&self) -> u32 {
+        self.native_window_buffer.width() as u32
     }
 
-    fn height(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.native_window_buffer.height() as u32).unwrap()
+    fn height(&self) -> u32 {
+        self.native_window_buffer.height() as u32
     }
 
     #[inline]
diff --git a/src/backends/cg.rs b/src/backends/cg.rs
@@ -273,12 +273,12 @@ pub struct BufferImpl<'a, D, W> {
 }
 
 impl<D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferImpl<'_, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.imp.width as u32).unwrap()
+    fn width(&self) -> u32 {
+        self.imp.width as u32
     }
 
-    fn height(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.imp.height as u32).unwrap()
+    fn height(&self) -> u32 {
+        self.imp.height as u32
     }
 
     #[inline]
diff --git a/src/backends/kms.rs b/src/backends/kms.rs
@@ -301,12 +301,12 @@ impl<D: ?Sized, W: ?Sized> Drop for KmsImpl<D, W> {
 }
 
 impl<D: ?Sized, W: ?Sized> BufferInterface for BufferImpl<'_, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        self.size.0
+    fn width(&self) -> u32 {
+        self.size.0.get()
     }
 
-    fn height(&self) -> NonZeroU32 {
-        self.size.1
+    fn height(&self) -> u32 {
+        self.size.1.get()
     }
 
     #[inline]
diff --git a/src/backends/orbital.rs b/src/backends/orbital.rs
@@ -200,12 +200,12 @@ pub struct BufferImpl<'a, D, W> {
 }
 
 impl<D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferImpl<'_, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.imp.width as u32).unwrap()
+    fn width(&self) -> u32 {
+        self.imp.width as u32
     }
 
-    fn height(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.imp.height as u32).unwrap()
+    fn height(&self) -> u32 {
+        self.imp.height as u32
     }
 
     #[inline]
diff --git a/src/backends/wayland/mod.rs b/src/backends/wayland/mod.rs
@@ -272,12 +272,12 @@ pub struct BufferImpl<'a, D: ?Sized, W> {
 }
 
 impl<D: HasDisplayHandle + ?Sized, W: HasWindowHandle> BufferInterface for BufferImpl<'_, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.width as u32).unwrap()
+    fn width(&self) -> u32 {
+        self.width as u32
     }
 
-    fn height(&self) -> NonZeroU32 {
-        NonZeroU32::new(self.height as usize as u32).unwrap()
+    fn height(&self) -> u32 {
+        self.height as usize as u32
     }
 
     #[inline]
diff --git a/src/backends/web.rs b/src/backends/web.rs
@@ -381,18 +381,20 @@ pub struct BufferImpl<'a, D, W> {
 }
 
 impl<D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferImpl<'_, D, W> {
-    fn width(&self) -> NonZeroU32 {
+    fn width(&self) -> u32 {
         self.imp
             .size
             .expect("must set size of surface before calling `width()` on the buffer")
             .0
+            .get()
     }
 
-    fn height(&self) -> NonZeroU32 {
+    fn height(&self) -> u32 {
         self.imp
             .size
             .expect("must set size of surface before calling `height()` on the buffer")
             .1
+            .get()
     }
 
     fn pixels(&self) -> &[u32] {
diff --git a/src/backends/win32.rs b/src/backends/win32.rs
@@ -287,12 +287,26 @@ impl<D: HasDisplayHandle, W: HasWindowHandle> SurfaceInterface<D, W> for Win32Im
 pub struct BufferImpl<'a, D, W>(&'a mut Win32Impl<D, W>);
 
 impl<D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferImpl<'_, D, W> {
-    fn width(&self) -> NonZeroU32 {
-        self.0.buffer.as_ref().unwrap().width.try_into().unwrap()
+    fn width(&self) -> u32 {
+        self.0
+            .buffer
+            .as_ref()
+            .unwrap()
+            .width
+            .get()
+            .try_into()
+            .unwrap()
     }
 
-    fn height(&self) -> NonZeroU32 {
-        self.0.buffer.as_ref().unwrap().height.try_into().unwrap()
+    fn height(&self) -> u32 {
+        self.0
+            .buffer
+            .as_ref()
+            .unwrap()
+            .height
+            .get()
+            .try_into()
+            .unwrap()
     }
 
     #[inline]
diff --git a/src/backends/x11.rs b/src/backends/x11.rs
@@ -393,12 +393,12 @@ pub struct BufferImpl<'a, D: ?Sized, W: ?Sized>(&'a mut X11Impl<D, W>);
 impl<D: HasDisplayHandle + ?Sized, W: HasWindowHandle + ?Sized> BufferInterface
     for BufferImpl<'_, D, W>
 {
-    fn width(&self) -> NonZeroU32 {
-        self.0.size.unwrap().0.into()
+    fn width(&self) -> u32 {
+        self.0.size.unwrap().0.get().into()
     }
 
-    fn height(&self) -> NonZeroU32 {
-        self.0.size.unwrap().1.into()
+    fn height(&self) -> u32 {
+        self.0.size.unwrap().1.get().into()
     }
 
     #[inline]
diff --git a/src/lib.rs b/src/lib.rs
@@ -209,21 +209,21 @@ pub struct Buffer<'a, D, W> {
 
 impl<D: HasDisplayHandle, W: HasWindowHandle> Buffer<'_, D, W> {
     /// The amount of pixels wide the buffer is.
-    pub fn width(&self) -> NonZeroU32 {
+    pub fn width(&self) -> u32 {
         let width = self.buffer_impl.width();
         debug_assert_eq!(
-            width.get() as usize * self.buffer_impl.height().get() as usize,
+            width as usize * self.buffer_impl.height() as usize,
             self.len(),
             "buffer must be sized correctly"
         );
         width
     }
 
     /// The amount of pixels tall the buffer is.
-    pub fn height(&self) -> NonZeroU32 {
+    pub fn height(&self) -> u32 {
         let height = self.buffer_impl.height();
         debug_assert_eq!(
-            height.get() as usize * self.buffer_impl.width().get() as usize,
+            height as usize * self.buffer_impl.width() as usize,
             self.len(),
             "buffer must be sized correctly"
         );

Original file line number	Diff line number	Diff line change
`@@ -125,12 +125,12 @@ pub struct BufferImpl<'a, D: ?Sized, W> {`
`125`	`125`	`unsafe impl<'a, D, W> Send for BufferImpl<'a, D, W> {}`
`126`	`126`
`127`	`127`	`impl<'a, D: HasDisplayHandle, W: HasWindowHandle> BufferInterface for BufferImpl<'a, D, W> {`
`128`		`- fn width(&self) -> NonZeroU32 {`
`129`		`- NonZeroU32::new(self.native_window_buffer.width() as u32).unwrap()`
	`128`	`+ fn width(&self) -> u32 {`
	`129`	`+ self.native_window_buffer.width() as u32`
`130`	`130`	`}`
`131`	`131`
`132`		`- fn height(&self) -> NonZeroU32 {`
`133`		`- NonZeroU32::new(self.native_window_buffer.height() as u32).unwrap()`
	`132`	`+ fn height(&self) -> u32 {`
	`133`	`+ self.native_window_buffer.height() as u32`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`#[inline]`