rename buffers

Author: teoxoy

crates/bevy_pbr/src/render/light.rs

@@ -523,13 +523,13 @@ pub struct ViewLightsUniformOffset {
 
 #[derive(Default)]
 pub struct GlobalLightMeta {
-    pub gpu_point_lights: Uniform<GpuPointLights>,
+    pub gpu_point_lights: UniformBuffer<GpuPointLights>,
     pub entity_to_index: HashMap<Entity, usize>,
 }
 
 #[derive(Default)]
 pub struct LightMeta {
-    pub view_gpu_lights: DynamicUniformVec<GpuLights>,
+    pub view_gpu_lights: DynamicUniformBuffer<GpuLights>,
     pub shadow_view_bind_group: Option<BindGroup>,
 }
 
@@ -954,9 +954,9 @@ impl Default for GpuClusterOffsetsAndCounts {
 #[derive(Component, Default)]
 pub struct ViewClusterBindings {
     n_indices: usize,
-    pub cluster_light_index_lists: Uniform<GpuClusterLightIndexLists>,
+    pub cluster_light_index_lists: UniformBuffer<GpuClusterLightIndexLists>,
     n_offsets: usize,
-    pub cluster_offsets_and_counts: Uniform<GpuClusterOffsetsAndCounts>,
+    pub cluster_offsets_and_counts: UniformBuffer<GpuClusterOffsetsAndCounts>,
 }
 
 impl ViewClusterBindings {

crates/bevy_render/src/render_component.rs

@@ -1,5 +1,5 @@
 use crate::{
-    render_resource::DynamicUniformVec,
+    render_resource::DynamicUniformBuffer,
     renderer::{RenderDevice, RenderQueue},
     RenderApp, RenderStage,
 };
@@ -70,11 +70,11 @@ impl<C: Component + WgslType + WriteInto + Clone> Plugin for UniformComponentPlu
 
 /// Stores all uniforms of the component type.
 pub struct ComponentUniforms<C: Component + WgslType> {
-    uniforms: DynamicUniformVec<C>,
+    uniforms: DynamicUniformBuffer<C>,
 }
 
 impl<C: Component + WgslType> Deref for ComponentUniforms<C> {
-    type Target = DynamicUniformVec<C>;
+    type Target = DynamicUniformBuffer<C>;
 
     #[inline]
     fn deref(&self) -> &Self::Target {
@@ -84,7 +84,7 @@ impl<C: Component + WgslType> Deref for ComponentUniforms<C> {
 
 impl<C: Component + WgslType> ComponentUniforms<C> {
     #[inline]
-    pub fn uniforms(&self) -> &DynamicUniformVec<C> {
+    pub fn uniforms(&self) -> &DynamicUniformBuffer<C> {
         &self.uniforms
     }
 }

crates/bevy_render/src/render_resource/uniform_vec.rs

@@ -2,36 +2,39 @@ use crate::{
     render_resource::Buffer,
     renderer::{RenderDevice, RenderQueue},
 };
-use encase::{internal::WriteInto, DynamicUniformBuffer, UniformBuffer, WgslType};
+use encase::{
+    internal::WriteInto, DynamicUniformBuffer as DynamicUniformBufferWrapper,
+    UniformBuffer as UniformBufferWrapper, WgslType,
+};
 use wgpu::{util::BufferInitDescriptor, BindingResource, BufferBinding, BufferUsages};
 
-pub struct Uniform<T: WgslType> {
+pub struct UniformBuffer<T: WgslType> {
     value: T,
-    scratch: UniformBuffer<Vec<u8>>,
+    scratch: UniformBufferWrapper<Vec<u8>>,
     buffer: Option<Buffer>,
 }
 
-impl<T: WgslType> From<T> for Uniform<T> {
+impl<T: WgslType> From<T> for UniformBuffer<T> {
     fn from(value: T) -> Self {
         Self {
             value,
-            scratch: UniformBuffer::new(Vec::new()),
+            scratch: UniformBufferWrapper::new(Vec::new()),
             buffer: None,
         }
     }
 }
 
-impl<T: WgslType + Default> Default for Uniform<T> {
+impl<T: WgslType + Default> Default for UniformBuffer<T> {
     fn default() -> Self {
         Self {
             value: T::default(),
-            scratch: UniformBuffer::new(Vec::new()),
+            scratch: UniformBufferWrapper::new(Vec::new()),
             buffer: None,
         }
     }
 }
 
-impl<T: WgslType + WriteInto> Uniform<T> {
+impl<T: WgslType + WriteInto> UniformBuffer<T> {
     #[inline]
     pub fn buffer(&self) -> Option<&Buffer> {
         self.buffer.as_ref()
@@ -72,25 +75,25 @@ impl<T: WgslType + WriteInto> Uniform<T> {
     }
 }
 
-pub struct DynamicUniformVec<T: WgslType> {
+pub struct DynamicUniformBuffer<T: WgslType> {
     values: Vec<T>,
-    scratch: DynamicUniformBuffer<Vec<u8>>,
+    scratch: DynamicUniformBufferWrapper<Vec<u8>>,
     buffer: Option<Buffer>,
     capacity: usize,
 }
 
-impl<T: WgslType> Default for DynamicUniformVec<T> {
+impl<T: WgslType> Default for DynamicUniformBuffer<T> {
     fn default() -> Self {
         Self {
             values: Vec::new(),
-            scratch: DynamicUniformBuffer::new(Vec::new()),
+            scratch: DynamicUniformBufferWrapper::new(Vec::new()),
             buffer: None,
             capacity: 0,
         }
     }
 }
 
-impl<T: WgslType + WriteInto> DynamicUniformVec<T> {
+impl<T: WgslType + WriteInto> DynamicUniformBuffer<T> {
     #[inline]
     pub fn buffer(&self) -> Option<&Buffer> {
         self.buffer.as_ref()

crates/bevy_render/src/view/mod.rs

@@ -13,7 +13,7 @@ use crate::{
     camera::ExtractedCamera,
     prelude::Image,
     render_asset::RenderAssets,
-    render_resource::{DynamicUniformVec, Texture, TextureView},
+    render_resource::{DynamicUniformBuffer, Texture, TextureView},
     renderer::{RenderDevice, RenderQueue},
     texture::{BevyDefault, TextureCache},
     RenderApp, RenderStage,
@@ -101,7 +101,7 @@ pub struct ViewUniform {
 
 #[derive(Default)]
 pub struct ViewUniforms {
-    pub uniforms: DynamicUniformVec<ViewUniform>,
+    pub uniforms: DynamicUniformBuffer<ViewUniform>,
 }
 
 #[derive(Component)]