mirror of
https://github.com/bevyengine/bevy
synced 2024-11-26 14:40:19 +00:00
c5963b4fd5
# Objective - Make use of storage buffers, where they are available, for clustered forward bindings to support far more point lights in a scene - Fixes #3605 - Based on top of #4079 This branch on an M1 Max can keep 60fps with about 2150 point lights of radius 1m in the Sponza scene where I've been testing. The bottleneck is mostly assigning lights to clusters which grows faster than linearly (I think 1000 lights was about 1.5ms and 5000 was 7.5ms). I have seen papers and presentations leveraging compute shaders that can get this up to over 1 million. That said, I think any further optimisations should probably be done in a separate PR. ## Solution - Add `RenderDevice` to the `Material` and `SpecializedMaterial` trait `::key()` functions to allow setting flags on the keys depending on feature/limit availability - Make `GpuPointLights` and `ViewClusterBuffers` into enums containing `UniformVec` and `StorageBuffer` variants. Implement the necessary API on them to make usage the same for both cases, and the only difference is at initialisation time. - Appropriate shader defs in the shader code to handle the two cases ## Context on some decisions / open questions - I'm using `max_storage_buffers_per_shader_stage >= 3` as a check to see if storage buffers are supported. I was thinking about diving into 'binding resource management' but it feels like we don't have enough use cases to understand the problem yet, and it is mostly a separate concern to this PR, so I think it should be handled separately. - Should `ViewClusterBuffers` and `ViewClusterBindings` be merged, duplicating the count variables into the enum variants? Co-authored-by: Carter Anderson <mcanders1@gmail.com>
151 lines
5.1 KiB
Rust
151 lines
5.1 KiB
Rust
use bevy::{
|
|
ecs::system::{lifetimeless::SRes, SystemParamItem},
|
|
pbr::MaterialPipeline,
|
|
prelude::*,
|
|
reflect::TypeUuid,
|
|
render::{
|
|
mesh::{MeshVertexAttribute, MeshVertexBufferLayout},
|
|
render_asset::{PrepareAssetError, RenderAsset},
|
|
render_resource::{
|
|
std140::{AsStd140, Std140},
|
|
BindGroup, BindGroupDescriptor, BindGroupEntry, BindGroupLayout,
|
|
BindGroupLayoutDescriptor, BindGroupLayoutEntry, BindingType, Buffer,
|
|
BufferBindingType, BufferInitDescriptor, BufferSize, BufferUsages,
|
|
RenderPipelineDescriptor, ShaderStages, SpecializedMeshPipelineError, VertexFormat,
|
|
},
|
|
renderer::RenderDevice,
|
|
},
|
|
};
|
|
|
|
fn main() {
|
|
App::new()
|
|
.add_plugins(DefaultPlugins)
|
|
.add_plugin(MaterialPlugin::<CustomMaterial>::default())
|
|
.add_startup_system(setup)
|
|
.run();
|
|
}
|
|
|
|
// A "high" random id should be used for custom attributes to ensure consistent sorting and avoid collisions with other attributes.
|
|
// See the MeshVertexAttribute docs for more info.
|
|
const ATTRIBUTE_BLEND_COLOR: MeshVertexAttribute =
|
|
MeshVertexAttribute::new("BlendColor", 988540917, VertexFormat::Float32x4);
|
|
|
|
/// set up a simple 3D scene
|
|
fn setup(
|
|
mut commands: Commands,
|
|
mut meshes: ResMut<Assets<Mesh>>,
|
|
mut materials: ResMut<Assets<CustomMaterial>>,
|
|
) {
|
|
let mut mesh = Mesh::from(shape::Cube { size: 1.0 });
|
|
mesh.insert_attribute(
|
|
ATTRIBUTE_BLEND_COLOR,
|
|
// The cube mesh has 24 vertices (6 faces, 4 vertices per face), so we insert one BlendColor for each
|
|
vec![[1.0, 0.0, 0.0, 1.0]; 24],
|
|
);
|
|
|
|
// cube
|
|
commands.spawn().insert_bundle(MaterialMeshBundle {
|
|
mesh: meshes.add(mesh),
|
|
transform: Transform::from_xyz(0.0, 0.5, 0.0),
|
|
material: materials.add(CustomMaterial {
|
|
color: Color::WHITE,
|
|
}),
|
|
..default()
|
|
});
|
|
|
|
// camera
|
|
commands.spawn_bundle(PerspectiveCameraBundle {
|
|
transform: Transform::from_xyz(-2.0, 2.5, 5.0).looking_at(Vec3::ZERO, Vec3::Y),
|
|
..default()
|
|
});
|
|
}
|
|
|
|
// This is the struct that will be passed to your shader
|
|
#[derive(Debug, Clone, TypeUuid)]
|
|
#[uuid = "f690fdae-d598-45ab-8225-97e2a3f056e0"]
|
|
pub struct CustomMaterial {
|
|
color: Color,
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct GpuCustomMaterial {
|
|
_buffer: Buffer,
|
|
bind_group: BindGroup,
|
|
}
|
|
|
|
// The implementation of [`Material`] needs this impl to work properly.
|
|
impl RenderAsset for CustomMaterial {
|
|
type ExtractedAsset = CustomMaterial;
|
|
type PreparedAsset = GpuCustomMaterial;
|
|
type Param = (SRes<RenderDevice>, SRes<MaterialPipeline<Self>>);
|
|
fn extract_asset(&self) -> Self::ExtractedAsset {
|
|
self.clone()
|
|
}
|
|
|
|
fn prepare_asset(
|
|
extracted_asset: Self::ExtractedAsset,
|
|
(render_device, material_pipeline): &mut SystemParamItem<Self::Param>,
|
|
) -> Result<Self::PreparedAsset, PrepareAssetError<Self::ExtractedAsset>> {
|
|
let color = Vec4::from_slice(&extracted_asset.color.as_linear_rgba_f32());
|
|
let buffer = render_device.create_buffer_with_data(&BufferInitDescriptor {
|
|
contents: color.as_std140().as_bytes(),
|
|
label: None,
|
|
usage: BufferUsages::UNIFORM | BufferUsages::COPY_DST,
|
|
});
|
|
let bind_group = render_device.create_bind_group(&BindGroupDescriptor {
|
|
entries: &[BindGroupEntry {
|
|
binding: 0,
|
|
resource: buffer.as_entire_binding(),
|
|
}],
|
|
label: None,
|
|
layout: &material_pipeline.material_layout,
|
|
});
|
|
|
|
Ok(GpuCustomMaterial {
|
|
_buffer: buffer,
|
|
bind_group,
|
|
})
|
|
}
|
|
}
|
|
|
|
impl Material for CustomMaterial {
|
|
fn vertex_shader(asset_server: &AssetServer) -> Option<Handle<Shader>> {
|
|
Some(asset_server.load("shaders/custom_vertex_attribute.wgsl"))
|
|
}
|
|
fn fragment_shader(asset_server: &AssetServer) -> Option<Handle<Shader>> {
|
|
Some(asset_server.load("shaders/custom_vertex_attribute.wgsl"))
|
|
}
|
|
|
|
fn bind_group(render_asset: &<Self as RenderAsset>::PreparedAsset) -> &BindGroup {
|
|
&render_asset.bind_group
|
|
}
|
|
|
|
fn bind_group_layout(render_device: &RenderDevice) -> BindGroupLayout {
|
|
render_device.create_bind_group_layout(&BindGroupLayoutDescriptor {
|
|
entries: &[BindGroupLayoutEntry {
|
|
binding: 0,
|
|
visibility: ShaderStages::FRAGMENT,
|
|
ty: BindingType::Buffer {
|
|
ty: BufferBindingType::Uniform,
|
|
has_dynamic_offset: false,
|
|
min_binding_size: BufferSize::new(Vec4::std140_size_static() as u64),
|
|
},
|
|
count: None,
|
|
}],
|
|
label: None,
|
|
})
|
|
}
|
|
|
|
fn specialize(
|
|
_pipeline: &MaterialPipeline<Self>,
|
|
descriptor: &mut RenderPipelineDescriptor,
|
|
layout: &MeshVertexBufferLayout,
|
|
) -> Result<(), SpecializedMeshPipelineError> {
|
|
let vertex_layout = layout.get_layout(&[
|
|
Mesh::ATTRIBUTE_POSITION.at_shader_location(0),
|
|
ATTRIBUTE_BLEND_COLOR.at_shader_location(1),
|
|
])?;
|
|
descriptor.vertex.buffers = vec![vertex_layout];
|
|
Ok(())
|
|
}
|
|
}
|