automatic min_size

bevyengine · Nov 23, 2023 · 009cf1e · 009cf1e
1 parent ce55027
commit 009cf1e
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 33 deletions.
diff --git a/crates/bevy_core_pipeline/src/bloom/downsampling_pipeline.rs b/crates/bevy_core_pipeline/src/bloom/downsampling_pipeline.rs
@@ -58,7 +58,7 @@ impl FromWorld for BloomDownsamplingPipeline {
                     // Sampler binding
                     sampler(SamplerBindingType::Filtering),
                     // Downsampling settings binding
-                    uniform_buffer(true, Some(BloomUniforms::min_size())),
+                    uniform_buffer::<BloomUniforms>(true),
                 ),
             ),
         );

diff --git a/crates/bevy_core_pipeline/src/bloom/upsampling_pipeline.rs b/crates/bevy_core_pipeline/src/bloom/upsampling_pipeline.rs
@@ -48,7 +48,7 @@ impl FromWorld for BloomUpsamplingPipeline {
                     // Sampler
                     sampler(SamplerBindingType::Filtering),
                     // BloomUniforms
-                    uniform_buffer(true, Some(BloomUniforms::min_size())),
+                    uniform_buffer::<BloomUniforms>(true),
                 ),
             ),
         );

diff --git a/crates/bevy_core_pipeline/src/contrast_adaptive_sharpening/mod.rs b/crates/bevy_core_pipeline/src/contrast_adaptive_sharpening/mod.rs
@@ -180,7 +180,7 @@ impl FromWorld for CASPipeline {
                     texture_2d(TextureSampleType::Float { filterable: true }),
                     sampler(SamplerBindingType::Filtering),
                     // CAS Settings
-                    uniform_buffer(true, Some(CASUniform::min_size())),
+                    uniform_buffer::<CASUniform>(true),
                 ),
             ),
         );

diff --git a/crates/bevy_core_pipeline/src/skybox/mod.rs b/crates/bevy_core_pipeline/src/skybox/mod.rs
@@ -14,7 +14,7 @@ use bevy_render::{
         BindGroup, BindGroupEntries, BindGroupLayout, BindGroupLayoutEntries,
         CachedRenderPipelineId, ColorTargetState, ColorWrites, CompareFunction, DepthBiasState,
         DepthStencilState, FragmentState, MultisampleState, PipelineCache, PrimitiveState,
-        RenderPipelineDescriptor, SamplerBindingType, Shader, ShaderStages, ShaderType,
+        RenderPipelineDescriptor, SamplerBindingType, Shader, ShaderStages,
         SpecializedRenderPipeline, SpecializedRenderPipelines, StencilFaceState, StencilState,
         TextureFormat, TextureSampleType, VertexState,
     },
@@ -88,7 +88,7 @@ impl SkyboxPipeline {
                     (
                         texture_cube(TextureSampleType::Float { filterable: true }),
                         sampler(SamplerBindingType::Filtering),
-                        uniform_buffer(true, Some(ViewUniform::min_size()))
+                        uniform_buffer::<ViewUniform>(true)
                             .visibility(ShaderStages::VERTEX_FRAGMENT),
                     ),
                 ),

diff --git a/crates/bevy_core_pipeline/src/tonemapping/mod.rs b/crates/bevy_core_pipeline/src/tonemapping/mod.rs
@@ -254,7 +254,7 @@ impl FromWorld for TonemappingPipeline {
         let mut entries = DynamicBindGroupLayoutEntries::new_with_indices(
             ShaderStages::FRAGMENT,
             (
-                (0, uniform_buffer(true, Some(ViewUniform::min_size()))),
+                (0, uniform_buffer::<ViewUniform>(true)),
                 (
                     1,
                     texture_2d(TextureSampleType::Float { filterable: false }),

diff --git a/crates/bevy_gizmos/src/lib.rs b/crates/bevy_gizmos/src/lib.rs
@@ -123,7 +123,7 @@ impl Plugin for GizmoPlugin {
             "LineGizmoUniform layout",
             &BindGroupLayoutEntries::single(
                 ShaderStages::VERTEX,
-                uniform_buffer(true, Some(LineGizmoUniform::min_size())),
+                uniform_buffer::<LineGizmoUniform>(true),
             ),
         );
 

diff --git a/crates/bevy_pbr/src/deferred/mod.rs b/crates/bevy_pbr/src/deferred/mod.rs
@@ -382,7 +382,7 @@ impl FromWorld for DeferredLightingLayout {
             "deferred_lighting_layout",
             &BindGroupLayoutEntries::single(
                 ShaderStages::VERTEX_FRAGMENT,
-                uniform_buffer(false, Some(PbrDeferredLightingDepthId::min_size())),
+                uniform_buffer::<PbrDeferredLightingDepthId>(false),
             ),
         );
         Self {

diff --git a/crates/bevy_pbr/src/prepass/mod.rs b/crates/bevy_pbr/src/prepass/mod.rs
@@ -236,11 +236,11 @@ impl<M: Material> FromWorld for PrepassPipeline<M> {
                 ShaderStages::VERTEX_FRAGMENT,
                 (
                     // View
-                    uniform_buffer(true, Some(ViewUniform::min_size())),
+                    uniform_buffer::<ViewUniform>(true),
                     // Globals
-                    uniform_buffer(false, Some(GlobalsUniform::min_size())),
+                    uniform_buffer::<GlobalsUniform>(false),
                     // PreviousViewProjection
-                    uniform_buffer(true, Some(PreviousViewProjection::min_size())),
+                    uniform_buffer::<PreviousViewProjection>(true),
                 ),
             ),
         );
@@ -251,9 +251,9 @@ impl<M: Material> FromWorld for PrepassPipeline<M> {
                 ShaderStages::VERTEX_FRAGMENT,
                 (
                     // View
-                    uniform_buffer(true, Some(ViewUniform::min_size())),
+                    uniform_buffer::<ViewUniform>(true),
                     // Globals
-                    uniform_buffer(false, Some(GlobalsUniform::min_size())),
+                    uniform_buffer::<GlobalsUniform>(false),
                 ),
             ),
         );

diff --git a/crates/bevy_pbr/src/render/mesh_bindings.rs b/crates/bevy_pbr/src/render/mesh_bindings.rs
@@ -17,14 +17,14 @@ mod layout_entry {
     use crate::MeshUniform;
     use bevy_render::{
         render_resource::{
-            binding_types::uniform_buffer, BindGroupLayoutEntry, BindingType, BufferSize,
+            binding_types::uniform_buffer_sized, BindGroupLayoutEntry, BindingType, BufferSize,
             GpuArrayBuffer, ShaderStages, TextureSampleType, TextureViewDimension,
         },
         renderer::RenderDevice,
     };
 
     fn buffer(binding: u32, size: u64, visibility: ShaderStages) -> BindGroupLayoutEntry {
-        uniform_buffer(true, BufferSize::new(size)).build(binding, visibility)
+        uniform_buffer_sized(true, BufferSize::new(size)).build(binding, visibility)
     }
     pub(super) fn model(render_device: &RenderDevice, binding: u32) -> BindGroupLayoutEntry {
         GpuArrayBuffer::<MeshUniform>::binding_layout(render_device)

diff --git a/crates/bevy_pbr/src/render/mesh_view_bindings.rs b/crates/bevy_pbr/src/render/mesh_view_bindings.rs
@@ -22,7 +22,7 @@ use bevy_render::{
         },
         BindGroup, BindGroupLayout, BindGroupLayoutEntry, BindGroupLayoutEntryBuilder, BindingType,
         BufferBindingType, DynamicBindGroupEntries, DynamicBindGroupLayoutEntries,
-        SamplerBindingType, ShaderStages, ShaderType, TextureFormat, TextureSampleType,
+        SamplerBindingType, ShaderStages, TextureFormat, TextureSampleType,
     },
     renderer::RenderDevice,
     texture::{BevyDefault, FallbackImageCubemap, FallbackImageMsaa, FallbackImageZero, Image},
@@ -159,7 +159,7 @@ fn buffer_layout(
     min_binding_size: Option<NonZeroU64>,
 ) -> BindGroupLayoutEntryBuilder {
     match buffer_binding_type {
-        BufferBindingType::Uniform => uniform_buffer(has_dynamic_offset, min_binding_size),
+        BufferBindingType::Uniform => uniform_buffer_sized(has_dynamic_offset, min_binding_size),
         BufferBindingType::Storage { read_only } => {
             if read_only {
                 storage_buffer_read_only(has_dynamic_offset, min_binding_size)
@@ -181,11 +181,10 @@ fn layout_entries(
             // View
             (
                 0,
-                uniform_buffer(true, Some(ViewUniform::min_size()))
-                    .visibility(ShaderStages::VERTEX_FRAGMENT),
+                uniform_buffer::<ViewUniform>(true).visibility(ShaderStages::VERTEX_FRAGMENT),
             ),
             // Lights
-            (1, uniform_buffer(true, Some(GpuLights::min_size()))),
+            (1, uniform_buffer::<GpuLights>(true)),
             // Point Shadow Texture Cube Array
             (
                 2,
@@ -240,9 +239,9 @@ fn layout_entries(
                 ),
             ),
             // Globals
-            (9, uniform_buffer(false, Some(GlobalsUniform::min_size()))),
+            (9, uniform_buffer::<GlobalsUniform>(false)),
             // Fog
-            (10, uniform_buffer(true, Some(GpuFog::min_size()))),
+            (10, uniform_buffer::<GpuFog>(true)),
             // Screen space ambient occlusion texture
             (
                 11,

diff --git a/crates/bevy_pbr/src/ssao/mod.rs b/crates/bevy_pbr/src/ssao/mod.rs
@@ -357,7 +357,7 @@ impl FromWorld for SsaoPipelines {
                 ShaderStages::COMPUTE,
                 (
                     sampler(SamplerBindingType::NonFiltering),
-                    uniform_buffer(true, Some(ViewUniform::min_size())),
+                    uniform_buffer::<ViewUniform>(true),
                 ),
             ),
         );
@@ -387,7 +387,7 @@ impl FromWorld for SsaoPipelines {
                     texture_2d_u32(),
                     texture_storage_2d(TextureFormat::R16Float, StorageTextureAccess::WriteOnly),
                     texture_storage_2d(TextureFormat::R32Uint, StorageTextureAccess::WriteOnly),
-                    uniform_buffer(false, Some(GlobalsUniform::min_size())),
+                    uniform_buffer::<GlobalsUniform>(false),
                 ),
             ),
         );

diff --git a/crates/bevy_render/src/render_resource/bind_group_layout_entries.rs b/crates/bevy_render/src/render_resource/bind_group_layout_entries.rs
@@ -356,6 +356,7 @@ pub mod binding_types {
     use crate::render_resource::{
         BufferBindingType, SamplerBindingType, TextureSampleType, TextureViewDimension,
     };
+    use encase::ShaderType;
     use std::num::NonZeroU64;
     use wgpu::{BindingType, StorageTextureAccess, TextureFormat};
 
@@ -385,7 +386,11 @@ pub mod binding_types {
         .into_bind_group_layout_entry_builder()
     }
 
-    pub fn uniform_buffer(
+    pub fn uniform_buffer<T: ShaderType>(has_dynamic_offset: bool) -> BindGroupLayoutEntryBuilder {
+        uniform_buffer_sized(has_dynamic_offset, Some(T::min_size()))
+    }
+
+    pub fn uniform_buffer_sized(
         has_dynamic_offset: bool,
         min_binding_size: Option<NonZeroU64>,
     ) -> BindGroupLayoutEntryBuilder {

diff --git a/crates/bevy_render/src/render_resource/gpu_array_buffer.rs b/crates/bevy_render/src/render_resource/gpu_array_buffer.rs
@@ -1,5 +1,5 @@
 use super::{
-    binding_types::{storage_buffer, uniform_buffer},
+    binding_types::{storage_buffer, uniform_buffer_sized},
     BindGroupLayoutEntryBuilder, StorageBuffer,
 };
 use crate::{
@@ -79,7 +79,7 @@ impl<T: GpuArrayBufferable> GpuArrayBuffer<T> {
 
     pub fn binding_layout(device: &RenderDevice) -> BindGroupLayoutEntryBuilder {
         if device.limits().max_storage_buffers_per_shader_stage == 0 {
-            uniform_buffer(
+            uniform_buffer_sized(
                 true,
                 // BatchedUniformBuffer uses a MaxCapacityArray that is runtime-sized, so we use
                 // None here and let wgpu figure out the size.

diff --git a/crates/bevy_sprite/src/mesh2d/mesh.rs b/crates/bevy_sprite/src/mesh2d/mesh.rs
@@ -262,8 +262,8 @@ impl FromWorld for Mesh2dPipeline {
                 ShaderStages::VERTEX_FRAGMENT,
                 (
                     // View
-                    uniform_buffer(true, Some(ViewUniform::min_size())),
-                    uniform_buffer(false, Some(GlobalsUniform::min_size())),
+                    uniform_buffer::<ViewUniform>(true),
+                    uniform_buffer::<GlobalsUniform>(false),
                 ),
             ),
         );

diff --git a/crates/bevy_sprite/src/render/mod.rs b/crates/bevy_sprite/src/render/mod.rs
@@ -60,7 +60,7 @@ impl FromWorld for SpritePipeline {
             "sprite_view_layout",
             &BindGroupLayoutEntries::single(
                 ShaderStages::VERTEX_FRAGMENT,
-                uniform_buffer(true, Some(ViewUniform::min_size())),
+                uniform_buffer::<ViewUniform>(true),
             ),
         );
 

diff --git a/crates/bevy_ui/src/render/pipeline.rs b/crates/bevy_ui/src/render/pipeline.rs
@@ -23,7 +23,7 @@ impl FromWorld for UiPipeline {
             "ui_view_layout",
             &BindGroupLayoutEntries::single(
                 ShaderStages::VERTEX_FRAGMENT,
-                uniform_buffer(true, Some(ViewUniform::min_size())),
+                uniform_buffer::<ViewUniform>(true),
             ),
         );
 

diff --git a/crates/bevy_ui/src/render/ui_material_pipeline.rs b/crates/bevy_ui/src/render/ui_material_pipeline.rs
@@ -227,7 +227,7 @@ impl<M: UiMaterial> FromWorld for UiMaterialPipeline<M> {
             "ui_view_layout",
             &BindGroupLayoutEntries::single(
                 ShaderStages::VERTEX_FRAGMENT,
-                uniform_buffer(true, Some(ViewUniform::min_size())),
+                uniform_buffer::<ViewUniform>(true),
             ),
         );
         UiMaterialPipeline {

diff --git a/examples/shader/post_processing.rs b/examples/shader/post_processing.rs
@@ -237,7 +237,7 @@ impl FromWorld for PostProcessPipeline {
                     // The sampler that will be used to sample the screen texture
                     sampler(SamplerBindingType::Filtering),
                     // The settings uniform that will control the effect
-                    uniform_buffer(false, Some(PostProcessSettings::min_size())),
+                    uniform_buffer::<PostProcessSettings>(false),
                 ),
             ),
         );