Merge branch 'crevice-padded-size' into directional-light-and-shadow

crates/crevice/src/std140/traits.rs

@@ -121,6 +121,13 @@ pub trait AsStd140 {
         size_of::<Self::Std140Type>()
     }
 
+    /// Returns the size of the `std140` version of this type, rounded up to the alignment.
+    /// Useful for pre-sizing buffers.
+    fn std140_padded_size_static() -> usize {
+        (Self::std140_size_static() + Self::Std140Type::ALIGNMENT - 1)
+            & !(Self::Std140Type::ALIGNMENT - 1)
+    }
+
     /// Converts from `std140` version of self to self.
     fn from_std140(val: Self::Std140Type) -> Self;
 }

crates/crevice/src/std430/traits.rs

@@ -121,6 +121,13 @@ pub trait AsStd430 {
         size_of::<Self::Std430Type>()
     }
 
+    /// Returns the size of the `std430` version of this type, rounded up to the alignment.
+    /// Useful for pre-sizing buffers.
+    fn std430_padded_size_static() -> usize {
+        (Self::std430_size_static() + Self::Std430Type::ALIGNMENT - 1)
+            & !(Self::Std430Type::ALIGNMENT - 1)
+    }
+
     /// Converts from `std430` version of self to self.
     fn from_std430(value: Self::Std430Type) -> Self;
 }

pipelined/bevy_pbr2/src/render/light.rs

@@ -100,9 +100,11 @@ impl FromWorld for ShadowShaders {
                     ty: BindingType::Buffer {
                         ty: BufferBindingType::Uniform,
                         has_dynamic_offset: true,
-                        // TODO: change this to ViewUniform::std140_size_static once crevice fixes this!
+                        // TODO: change this to ViewUniform::std140_padded_size_static once crevice fixes this!
                         // Context: https://github.com/LPGhatguy/crevice/issues/29
-                        min_binding_size: BufferSize::new(80),
+                        min_binding_size: BufferSize::new(
+                            ViewUniform::std140_padded_size_static() as u64
+                        ),
                     },
                     count: None,
                 },

pipelined/bevy_pbr2/src/render/mod.rs

@@ -14,7 +14,7 @@ use bevy_render2::{
     renderer::{RenderContext, RenderDevice, RenderQueue},
     shader::Shader,
     texture::{BevyDefault, GpuImage, Image, TextureFormatPixelInfo},
-    view::{ExtractedView, ViewMeta, ViewUniformOffset},
+    view::{ExtractedView, ViewMeta, ViewUniform, ViewUniformOffset},
 };
 use bevy_transform::components::GlobalTransform;
 use bevy_utils::slab::{FrameSlabMap, FrameSlabMapKey};
@@ -53,9 +53,11 @@ impl FromWorld for PbrShaders {
                     ty: BindingType::Buffer {
                         ty: BufferBindingType::Uniform,
                         has_dynamic_offset: true,
-                        // TODO: change this to ViewUniform::std140_size_static once crevice fixes this!
+                        // TODO: change this to ViewUniform::std140_padded_size_static once crevice fixes this!
                         // Context: https://github.com/LPGhatguy/crevice/issues/29
-                        min_binding_size: BufferSize::new(80),
+                        min_binding_size: BufferSize::new(
+                            ViewUniform::std140_padded_size_static() as u64
+                        ),
                     },
                     count: None,
                 },
@@ -66,9 +68,11 @@ impl FromWorld for PbrShaders {
                     ty: BindingType::Buffer {
                         ty: BufferBindingType::Uniform,
                         has_dynamic_offset: true,
-                        // TODO: change this to ViewUniform::std140_size_static once crevice fixes this!
+                        // TODO: change this to GpuLights::std140_padded_size_static once crevice fixes this!
                         // Context: https://github.com/LPGhatguy/crevice/issues/29
-                        min_binding_size: BufferSize::new(1264),
+                        min_binding_size: BufferSize::new(
+                            GpuLights::std140_padded_size_static() as u64
+                        ),
                     },
                     count: None,
                 },
@@ -104,7 +108,7 @@ impl FromWorld for PbrShaders {
                 ty: BindingType::Buffer {
                     ty: BufferBindingType::Uniform,
                     has_dynamic_offset: true,
-                    min_binding_size: BufferSize::new(Mat4::std140_size_static() as u64),
+                    min_binding_size: BufferSize::new(Mat4::std140_padded_size_static() as u64),
                 },
                 count: None,
             }],
@@ -120,7 +124,7 @@ impl FromWorld for PbrShaders {
                         ty: BufferBindingType::Uniform,
                         has_dynamic_offset: false,
                         min_binding_size: BufferSize::new(
-                            StandardMaterialUniformData::std140_size_static() as u64,
+                            StandardMaterialUniformData::std140_padded_size_static() as u64,
                         ),
                     },
                     count: None,

pipelined/bevy_render2/src/render_resource/uniform_vec.rs

@@ -1,5 +1,5 @@
 use crate::{render_resource::Buffer, renderer::RenderDevice};
-use crevice::std140::{self, AsStd140, DynamicUniform, Std140};
+use crevice::std140::{self, AsStd140, DynamicUniform};
 use std::{num::NonZeroU64, ops::DerefMut};
 use wgpu::{BindingResource, BufferBinding, BufferDescriptor, BufferUsage, CommandEncoder};
 
@@ -18,8 +18,7 @@ impl<T: AsStd140> Default for UniformVec<T> {
             staging_buffer: None,
             uniform_buffer: None,
             capacity: 0,
-            item_size: (T::std140_size_static() + <T as AsStd140>::Std140Type::ALIGNMENT - 1)
-                & !(<T as AsStd140>::Std140Type::ALIGNMENT - 1),
+            item_size: T::std140_padded_size_static(),
         }
     }
 }