rt(gl): use array_init instead of manually doing it with MaybeUninit

Cargo.lock

@@ -1591,11 +1591,9 @@ dependencies = [
  "bitflags 2.6.0",
  "bytemuck",
  "glslang",
- "indexmap",
  "librashader-common",
  "librashader-preprocess",
  "librashader-presets",
- "matches",
  "naga",
  "rspirv",
  "rustc-hash 2.0.0",
@@ -1687,6 +1685,7 @@ dependencies = [
 name = "librashader-runtime-gl"
 version = "0.4.5"
 dependencies = [
+ "array-init",
  "bytemuck",
  "glfw 0.47.0",
  "glow 0.14.1",
@@ -1842,12 +1841,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "memchr"
 version = "2.7.4"

librashader-reflect/Cargo.toml

@@ -29,9 +29,6 @@ rspirv = { version = "0.12.0", optional = true }
 spirv = { version = "0.3.0", optional = true}
 
 serde = { version = "1.0", features = ["derive"], optional = true }
-
-indexmap = { version = "2.1.0", features = [] }
-matches = { version = "0.1.10", features = [] }
 rustc-hash = "2.0.0"
 
 [target.'cfg(windows)'.dependencies.spirv-to-dxil]

librashader-runtime-gl/Cargo.toml

@@ -24,6 +24,7 @@ glow = { workspace = true}
 bytemuck = { version = "1.12.3", features = ["derive"] }
 thiserror = "1.0.37"
 rayon = "1.6.1"
+array-init = "2.1.0"
 
 [features]
 stable = ["librashader-reflect/stable"]

librashader-runtime-gl/src/gl/gl3/ubo_ring.rs

@@ -7,27 +7,15 @@ use librashader_reflect::reflect::semantics::BufferReflection;
 use librashader_runtime::ringbuffer::InlineRingBuffer;
 use librashader_runtime::ringbuffer::RingBuffer;
 use librashader_runtime::uniforms::UniformStorageAccess;
-use std::mem::MaybeUninit;
 
 pub struct Gl3UboRing<const SIZE: usize> {
     ring: InlineRingBuffer<glow::Buffer, SIZE>,
 }
 
-impl<const SIZE: usize> Gl3UboRing<SIZE> {
-    const _ASSERT_TRANSMUTABLE: () = assert!(
-        std::mem::size_of::<[glow::Buffer; SIZE]>()
-            == std::mem::size_of::<[MaybeUninit<glow::Buffer>; SIZE]>()
-    );
-}
-
 impl<const SIZE: usize> UboRing<SIZE> for Gl3UboRing<SIZE> {
     fn new(ctx: &glow::Context, buffer_size: u32) -> error::Result<Self> {
-        // TODO: array::try_from_fn whenever that gets stabilized
+        let items: [glow::Buffer; SIZE] = array_init::try_array_init(|_| unsafe {
-        //       this is basically blocking on try_trait_v2
+            ctx
-        let mut items: [MaybeUninit<glow::Buffer>; SIZE] = [MaybeUninit::zeroed(); SIZE];
-        for items in items.iter_mut() {
-            unsafe {
-                let buffer = ctx
                 .create_buffer()
                 .map(|buffer| {
                     ctx.bind_buffer(glow::UNIFORM_BUFFER, Some(buffer));
@@ -39,18 +27,9 @@ impl<const SIZE: usize> UboRing<SIZE> for Gl3UboRing<SIZE> {
                     ctx.bind_buffer(glow::UNIFORM_BUFFER, None);
                     buffer
                 })
-                    .map_err(FilterChainError::GlError)?;
+        }).map_err(FilterChainError::GlError)?;
-
-                *items = MaybeUninit::new(buffer)
-            }
-        }
-
-        // SAFETY: everything was initialized above.
-        // MaybeUninit<glow::Buffer> and glow::Buffer have the same size.
-        let items: [glow::Buffer; SIZE] = unsafe { std::mem::transmute_copy(&items) };
 
         let ring: InlineRingBuffer<glow::Buffer, SIZE> = InlineRingBuffer::from_array(items);
-
         Ok(Gl3UboRing { ring })
     }
 

librashader-runtime-gl/src/gl/gl46/ubo_ring.rs

@@ -7,27 +7,15 @@ use librashader_reflect::reflect::semantics::BufferReflection;
 use librashader_runtime::ringbuffer::InlineRingBuffer;
 use librashader_runtime::ringbuffer::RingBuffer;
 use librashader_runtime::uniforms::UniformStorageAccess;
-use std::mem::MaybeUninit;
 
 pub struct Gl46UboRing<const SIZE: usize> {
     ring: InlineRingBuffer<glow::Buffer, SIZE>,
 }
 
-impl<const SIZE: usize> Gl46UboRing<SIZE> {
-    const _ASSERT_TRANSMUTABLE: () = assert!(
-        std::mem::size_of::<[glow::Buffer; SIZE]>()
-            == std::mem::size_of::<[MaybeUninit<glow::Buffer>; SIZE]>()
-    );
-}
-
 impl<const SIZE: usize> UboRing<SIZE> for Gl46UboRing<SIZE> {
     fn new(context: &glow::Context, buffer_size: u32) -> error::Result<Self> {
-        // TODO: array::try_from_fn whenever that gets stabilized
+        let items: [glow::Buffer; SIZE] = array_init::try_array_init(|_| unsafe {
-        //       this is basically blocking on try_trait_v2
+            context
-        let mut items: [MaybeUninit<glow::Buffer>; SIZE] = [MaybeUninit::zeroed(); SIZE];
-        for items in items.iter_mut() {
-            unsafe {
-                let buffer = context
                 .create_named_buffer()
                 .map(|buffer| {
                     context.named_buffer_data_size(
@@ -37,16 +25,9 @@ impl<const SIZE: usize> UboRing<SIZE> for Gl46UboRing<SIZE> {
                     );
                     buffer
                 })
-                    .map_err(FilterChainError::GlError)?;
+        }).map_err(FilterChainError::GlError)?;
 
-                *items = MaybeUninit::new(buffer)
-            }
-        }
-
-        // SAFETY: everything was initialized above.
-        let items: [glow::Buffer; SIZE] = unsafe { std::mem::transmute_copy(&items) };
         let ring: InlineRingBuffer<glow::Buffer, SIZE> = InlineRingBuffer::from_array(items);
-
         Ok(Gl46UboRing { ring })
     }