diff --git a/crates/bevy_render/src/render_resource/buffer_vec.rs b/crates/bevy_render/src/render_resource/buffer_vec.rs index d3f16ac341..0feaa84878 100644 --- a/crates/bevy_render/src/render_resource/buffer_vec.rs +++ b/crates/bevy_render/src/render_resource/buffer_vec.rs @@ -29,13 +29,13 @@ use super::GpuArrayBufferable; /// from system RAM to VRAM. /// /// Other options for storing GPU-accessible data are: -/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) +/// * [`BufferVec`] /// * [`DynamicStorageBuffer`](crate::render_resource::DynamicStorageBuffer) -/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) /// * [`DynamicUniformBuffer`](crate::render_resource::DynamicUniformBuffer) /// * [`GpuArrayBuffer`](crate::render_resource::GpuArrayBuffer) -/// * [`BufferVec`] +/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) /// * [`Texture`](crate::render_resource::Texture) +/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) pub struct RawBufferVec { values: Vec, buffer: Option, @@ -233,6 +233,15 @@ impl Extend for RawBufferVec { /// CPU access to the data after it's been added via [`BufferVec::push`]. If you /// need CPU access to the data, consider another type, such as /// [`StorageBuffer`][super::StorageBuffer]. +/// +/// Other options for storing GPU-accessible data are: +/// * [`DynamicStorageBuffer`](crate::render_resource::DynamicStorageBuffer) +/// * [`DynamicUniformBuffer`](crate::render_resource::DynamicUniformBuffer) +/// * [`GpuArrayBuffer`](crate::render_resource::GpuArrayBuffer) +/// * [`RawBufferVec`] +/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) +/// * [`Texture`](crate::render_resource::Texture) +/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) pub struct BufferVec where T: ShaderType + WriteInto, diff --git a/crates/bevy_render/src/render_resource/gpu_array_buffer.rs b/crates/bevy_render/src/render_resource/gpu_array_buffer.rs index 92fb014939..195920ee0c 100644 --- a/crates/bevy_render/src/render_resource/gpu_array_buffer.rs +++ b/crates/bevy_render/src/render_resource/gpu_array_buffer.rs @@ -24,13 +24,13 @@ impl GpuArrayBufferable for T {} /// binding (within reasonable limits). /// /// Other options for storing GPU-accessible data are: -/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) +/// * [`BufferVec`] /// * [`DynamicStorageBuffer`](crate::render_resource::DynamicStorageBuffer) -/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) /// * [`DynamicUniformBuffer`](crate::render_resource::DynamicUniformBuffer) /// * [`RawBufferVec`](crate::render_resource::RawBufferVec) -/// * [`BufferVec`] +/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) /// * [`Texture`](crate::render_resource::Texture) +/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) #[derive(Resource)] pub enum GpuArrayBuffer { Uniform(BatchedUniformBuffer), diff --git a/crates/bevy_render/src/render_resource/storage_buffer.rs b/crates/bevy_render/src/render_resource/storage_buffer.rs index d7ce706cb0..b407e22d8f 100644 --- a/crates/bevy_render/src/render_resource/storage_buffer.rs +++ b/crates/bevy_render/src/render_resource/storage_buffer.rs @@ -22,14 +22,13 @@ use super::IntoBinding; /// is automatically enforced by this structure. /// /// Other options for storing GPU-accessible data are: +/// * [`BufferVec`](crate::render_resource::BufferVec) /// * [`DynamicStorageBuffer`] -/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) /// * [`DynamicUniformBuffer`](crate::render_resource::DynamicUniformBuffer) /// * [`GpuArrayBuffer`](crate::render_resource::GpuArrayBuffer) /// * [`RawBufferVec`](crate::render_resource::RawBufferVec) -/// * [`BufferVec`](crate::render_resource::BufferVec) -/// * [`BufferVec`](crate::render_resource::BufferVec) /// * [`Texture`](crate::render_resource::Texture) +/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) /// /// [std430 alignment/padding requirements]: https://www.w3.org/TR/WGSL/#address-spaces-storage pub struct StorageBuffer { @@ -170,14 +169,13 @@ impl<'a, T: ShaderType + WriteInto> IntoBinding<'a> for &'a StorageBuffer { /// will additionally be aligned to meet dynamic offset alignment requirements. /// /// Other options for storing GPU-accessible data are: -/// * [`StorageBuffer`] -/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) +/// * [`BufferVec`](crate::render_resource::BufferVec) /// * [`DynamicUniformBuffer`](crate::render_resource::DynamicUniformBuffer) /// * [`GpuArrayBuffer`](crate::render_resource::GpuArrayBuffer) /// * [`RawBufferVec`](crate::render_resource::RawBufferVec) -/// * [`BufferVec`](crate::render_resource::BufferVec) -/// * [`BufferVec`](crate::render_resource::BufferVec) +/// * [`StorageBuffer`] /// * [`Texture`](crate::render_resource::Texture) +/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) /// /// [std430 alignment/padding requirements]: https://www.w3.org/TR/WGSL/#address-spaces-storage pub struct DynamicStorageBuffer { diff --git a/crates/bevy_render/src/render_resource/texture.rs b/crates/bevy_render/src/render_resource/texture.rs index 0da64053e1..4ebcf0373a 100644 --- a/crates/bevy_render/src/render_resource/texture.rs +++ b/crates/bevy_render/src/render_resource/texture.rs @@ -11,6 +11,15 @@ define_atomic_id!(TextureId); /// /// May be converted from and dereferences to a wgpu [`Texture`](wgpu::Texture). /// Can be created via [`RenderDevice::create_texture`](crate::renderer::RenderDevice::create_texture). +/// +/// Other options for storing GPU-accessible data are: +/// * [`BufferVec`](crate::render_resource::BufferVec) +/// * [`DynamicStorageBuffer`](crate::render_resource::DynamicStorageBuffer) +/// * [`DynamicUniformBuffer`](crate::render_resource::DynamicUniformBuffer) +/// * [`GpuArrayBuffer`](crate::render_resource::GpuArrayBuffer) +/// * [`RawBufferVec`](crate::render_resource::RawBufferVec) +/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) +/// * [`UniformBuffer`](crate::render_resource::UniformBuffer) #[derive(Clone, Debug)] pub struct Texture { id: TextureId, diff --git a/crates/bevy_render/src/render_resource/uniform_buffer.rs b/crates/bevy_render/src/render_resource/uniform_buffer.rs index 95e1a0a566..48c2b4a62a 100644 --- a/crates/bevy_render/src/render_resource/uniform_buffer.rs +++ b/crates/bevy_render/src/render_resource/uniform_buffer.rs @@ -27,12 +27,12 @@ use super::IntoBinding; /// (vectors), or structures with fields that are vectors. /// /// Other options for storing GPU-accessible data are: -/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) +/// * [`BufferVec`](crate::render_resource::BufferVec) /// * [`DynamicStorageBuffer`](crate::render_resource::DynamicStorageBuffer) /// * [`DynamicUniformBuffer`] /// * [`GpuArrayBuffer`](crate::render_resource::GpuArrayBuffer) /// * [`RawBufferVec`](crate::render_resource::RawBufferVec) -/// * [`BufferVec`](crate::render_resource::BufferVec) +/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) /// * [`Texture`](crate::render_resource::Texture) /// /// [std140 alignment/padding requirements]: https://www.w3.org/TR/WGSL/#address-spaces-uniform @@ -164,14 +164,13 @@ impl<'a, T: ShaderType + WriteInto> IntoBinding<'a> for &'a UniformBuffer { /// (vectors), or structures with fields that are vectors. /// /// Other options for storing GPU-accessible data are: -/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) +/// * [`BufferVec`](crate::render_resource::BufferVec) /// * [`DynamicStorageBuffer`](crate::render_resource::DynamicStorageBuffer) -/// * [`UniformBuffer`] -/// * [`DynamicUniformBuffer`] /// * [`GpuArrayBuffer`](crate::render_resource::GpuArrayBuffer) /// * [`RawBufferVec`](crate::render_resource::RawBufferVec) -/// * [`BufferVec`](crate::render_resource::BufferVec) +/// * [`StorageBuffer`](crate::render_resource::StorageBuffer) /// * [`Texture`](crate::render_resource::Texture) +/// * [`UniformBuffer`] /// /// [std140 alignment/padding requirements]: https://www.w3.org/TR/WGSL/#address-spaces-uniform pub struct DynamicUniformBuffer {