Use PixelUnpackData in tex_image_1d

Signed-off-by: sagudev <[email protected]>
grovesNL · Nov 1, 2024 · dd9150b · dd9150b
1 parent 6a360ef
commit dd9150b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -1070,7 +1070,7 @@ pub trait HasContext: __private::Sealed {
         border: i32,
         format: u32,
         ty: u32,
-        pixels: Option<&[u8]>,
+        pixels: PixelUnpackData,
     );
 
     unsafe fn compressed_tex_image_1d(

diff --git a/src/native.rs b/src/native.rs
@@ -2435,7 +2435,7 @@ impl HasContext for Context {
         border: i32,
         format: u32,
         ty: u32,
-        pixels: Option<&[u8]>,
+        pixels: PixelUnpackData,
     ) {
         let gl = &self.raw;
         gl.TexImage1D(
@@ -2446,7 +2446,10 @@ impl HasContext for Context {
             border,
             format,
             ty,
-            pixels.map(|p| p.as_ptr()).unwrap_or(std::ptr::null()) as *const std::ffi::c_void,
+            match pixels {
+                PixelUnpackData::BufferOffset(offset) => offset as *const std::ffi::c_void,
+                PixelUnpackData::Slice(data) => data.as_ptr() as *const std::ffi::c_void,
+            },
         );
     }
 

diff --git a/src/web_sys.rs b/src/web_sys.rs
@@ -3940,7 +3940,7 @@ impl HasContext for Context {
         _border: i32,
         _format: u32,
         _ty: u32,
-        _pixels: Option<&[u8]>,
+        _pixels: PixelUnpackData,
     ) {
         panic!("Tex image 1D is not supported");
     }