forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Move environment map generation resources to RenderStartup

Browse Source
This commit is contained in:
Máté Homolya 2025-07-16 22:38:47 -07:00
parent d2e8fd9bcd
commit 1790139d58
No known key found for this signature in database
3 changed files with 278 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

545
crates/bevy_pbr/src/light_probe/generate.rs
View File

@ -19,7 +19,7 @@
//! [single-pass down-sampling]: <SPD-paper-URL> //! [single-pass down-sampling]: <SPD-paper-URL>
//! [Lambertian convolution]: <reference-URL> //! [Lambertian convolution]: <reference-URL>
//! [GGX convolution]: <reference-URL> //! [GGX convolution]: <reference-URL>
use bevy_asset::{load_embedded_asset, uuid_handle, Assets, Handle}; use bevy_asset::{load_embedded_asset, uuid_handle, AssetServer, Assets, Handle};
use bevy_ecs::{ use bevy_ecs::{
component::Component, component::Component,
entity::Entity, entity::Entity,
@ -53,7 +53,7 @@ use bevy_light::{EnvironmentMapLight, GeneratedEnvironmentMapLight};
use core::cmp::min; use core::cmp::min;
/// Handle for Spatio-Temporal Blue Noise texture /// Handle for Spatio-Temporal Blue Noise texture
pub const SBTN: Handle<Image> = uuid_handle!("3110b545-78e0-48fc-b86e-8bc0ea50fc67"); pub const STBN: Handle<Image> = uuid_handle!("3110b545-78e0-48fc-b86e-8bc0ea50fc67");
/// Labels for the environment map generation nodes /// Labels for the environment map generation nodes
#[derive(PartialEq, Eq, Debug, Copy, Clone, Hash, RenderLabel)] #[derive(PartialEq, Eq, Debug, Copy, Clone, Hash, RenderLabel)]
@ -72,215 +72,12 @@ pub struct GeneratorBindGroupLayouts {
pub copy: BindGroupLayout, pub copy: BindGroupLayout,
} }
impl FromWorld for GeneratorBindGroupLayouts {
fn from_world(world: &mut World) -> Self {
let render_device = world.resource::<RenderDevice>();
// SPD (Single Pass Downsampling) bind group layout
let spd = render_device.create_bind_group_layout(
"spd_bind_group_layout",
&BindGroupLayoutEntries::with_indices(
ShaderStages::COMPUTE,
(
(
0,
texture_2d_array(TextureSampleType::Float { filterable: true }),
), // Source texture
(
1,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 1
(
2,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 2
(
3,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 3
(
4,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 4
(
5,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 5
(
6,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::ReadWrite,
),
), // Output mip 6
(
7,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 7
(
8,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 8
(
9,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 9
(
10,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 10
(
11,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 11
(
12,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 12
(13, sampler(SamplerBindingType::Filtering)), // Linear sampler
(14, uniform_buffer::<SpdConstants>(false)), // Uniforms
),
),
);
// Radiance map bind group layout
let radiance = render_device.create_bind_group_layout(
"radiance_bind_group_layout",
&BindGroupLayoutEntries::with_indices(
ShaderStages::COMPUTE,
(
(
0,
texture_2d_array(TextureSampleType::Float { filterable: true }),
), // Source environment cubemap
(1, sampler(SamplerBindingType::Filtering)), // Source sampler
(
2,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output specular map
(3, uniform_buffer::<FilteringConstants>(false)), // Uniforms
(4, texture_2d(TextureSampleType::Float { filterable: true })), // Blue noise texture
),
),
);
// Irradiance convolution bind group layout
let irradiance = render_device.create_bind_group_layout(
"irradiance_bind_group_layout",
&BindGroupLayoutEntries::with_indices(
ShaderStages::COMPUTE,
(
(
0,
texture_2d_array(TextureSampleType::Float { filterable: true }),
), // Source environment cubemap
(1, sampler(SamplerBindingType::Filtering)), // Source sampler
(
2,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output irradiance map
(3, uniform_buffer::<FilteringConstants>(false)), // Uniforms
(4, texture_2d(TextureSampleType::Float { filterable: true })), // Blue noise texture
),
),
);
// Copy bind group layout
let copy = render_device.create_bind_group_layout(
"copy_mip0_bind_group_layout",
&BindGroupLayoutEntries::with_indices(
ShaderStages::COMPUTE,
(
// source cubemap
(
0,
texture_2d_array(TextureSampleType::Float { filterable: true }),
),
// destination mip0 storage of the intermediate texture
(
1,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
),
),
),
);
Self {
spd,
radiance,
irradiance,
copy,
}
}
}
/// Samplers for the environment map generation pipelines /// Samplers for the environment map generation pipelines
#[derive(Resource)] #[derive(Resource)]
pub struct GeneratorSamplers { pub struct GeneratorSamplers {
pub linear: Sampler, pub linear: Sampler,
} }
impl FromWorld for GeneratorSamplers {
fn from_world(world: &mut World) -> Self {
let render_device = world.resource::<RenderDevice>();
let linear = render_device.create_sampler(&SamplerDescriptor {
label: Some("generator_linear_sampler"),
address_mode_u: AddressMode::ClampToEdge,
address_mode_v: AddressMode::ClampToEdge,
address_mode_w: AddressMode::ClampToEdge,
mag_filter: FilterMode::Linear,
min_filter: FilterMode::Linear,
mipmap_filter: FilterMode::Linear,
..Default::default()
});
Self { linear }
}
}
/// Pipelines for the environment map generation pipelines /// Pipelines for the environment map generation pipelines
#[derive(Resource)] #[derive(Resource)]
pub struct GeneratorPipelines { pub struct GeneratorPipelines {
@ -291,82 +88,280 @@ pub struct GeneratorPipelines {
pub copy: CachedComputePipelineId, pub copy: CachedComputePipelineId,
} }
impl FromWorld for GeneratorPipelines { /// Initializes all render-world resources used by the environment-map generator once on
fn from_world(world: &mut World) -> Self { /// [`bevy_render::RenderStartup`].
let pipeline_cache = world.resource::<PipelineCache>(); pub fn init_generator_resources(
let layouts = world.resource::<GeneratorBindGroupLayouts>(); mut commands: Commands,
render_device: Res<RenderDevice>,
pipeline_cache: Res<PipelineCache>,
asset_server: Res<AssetServer>,
) {
// Bind group layouts
let spd = render_device.create_bind_group_layout(
"spd_bind_group_layout",
&BindGroupLayoutEntries::with_indices(
ShaderStages::COMPUTE,
(
(
0,
texture_2d_array(TextureSampleType::Float { filterable: true }),
), // Source texture
(
1,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 1
(
2,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 2
(
3,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 3
(
4,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 4
(
5,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 5
(
6,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::ReadWrite,
),
), // Output mip 6
(
7,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 7
(
8,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 8
(
9,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 9
(
10,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 10
(
11,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 11
(
12,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output mip 12
(13, sampler(SamplerBindingType::Filtering)), // Linear sampler
(14, uniform_buffer::<SpdConstants>(false)), // Uniforms
),
),
);
let render_device = world.resource::<RenderDevice>(); let radiance = render_device.create_bind_group_layout(
let features = render_device.features(); "radiance_bind_group_layout",
let shader_defs = if features.contains(WgpuFeatures::SUBGROUP) { &BindGroupLayoutEntries::with_indices(
vec![ShaderDefVal::Int("SUBGROUP_SUPPORT".into(), 1)] ShaderStages::COMPUTE,
} else { (
vec![] (
}; 0,
texture_2d_array(TextureSampleType::Float { filterable: true }),
), // Source environment cubemap
(1, sampler(SamplerBindingType::Filtering)), // Source sampler
(
2,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output specular map
(3, uniform_buffer::<FilteringConstants>(false)), // Uniforms
(4, texture_2d(TextureSampleType::Float { filterable: true })), // Blue noise texture
),
),
);
// Single Pass Downsampling for Base Mip Levels (0-5) let irradiance = render_device.create_bind_group_layout(
let spd_first = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { "irradiance_bind_group_layout",
label: Some("spd_first_pipeline".into()), &BindGroupLayoutEntries::with_indices(
layout: vec![layouts.spd.clone()], ShaderStages::COMPUTE,
push_constant_ranges: vec![], (
shader: load_embedded_asset!(world, "spd.wgsl"), (
shader_defs: shader_defs.clone(), 0,
entry_point: Some("spd_downsample_first".into()), texture_2d_array(TextureSampleType::Float { filterable: true }),
zero_initialize_workgroup_memory: false, ), // Source environment cubemap
}); (1, sampler(SamplerBindingType::Filtering)), // Source sampler
(
2,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Output irradiance map
(3, uniform_buffer::<FilteringConstants>(false)), // Uniforms
(4, texture_2d(TextureSampleType::Float { filterable: true })), // Blue noise texture
),
),
);
// Single Pass Downsampling for Remaining Mip Levels (6-12) let copy = render_device.create_bind_group_layout(
let spd_second = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { "copy_mip0_bind_group_layout",
label: Some("spd_second_pipeline".into()), &BindGroupLayoutEntries::with_indices(
layout: vec![layouts.spd.clone()], ShaderStages::COMPUTE,
push_constant_ranges: vec![], (
shader: load_embedded_asset!(world, "spd.wgsl"), (
shader_defs, 0,
entry_point: Some("spd_downsample_second".into()), texture_2d_array(TextureSampleType::Float { filterable: true }),
zero_initialize_workgroup_memory: false, ), // Source cubemap
}); (
1,
texture_storage_2d_array(
TextureFormat::Rgba16Float,
StorageTextureAccess::WriteOnly,
),
), // Destination mip0
),
),
);
// Radiance map for Specular Environment Maps let layouts = GeneratorBindGroupLayouts {
let radiance = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { spd,
label: Some("radiance_pipeline".into()), radiance,
layout: vec![layouts.radiance.clone()], irradiance,
push_constant_ranges: vec![], copy,
shader: load_embedded_asset!(world, "environment_filter.wgsl"), };
shader_defs: vec![],
entry_point: Some("generate_radiance_map".into()),
zero_initialize_workgroup_memory: false,
});
// Irradiance map for Diffuse Environment Maps // Samplers
let irradiance = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor { let linear = render_device.create_sampler(&SamplerDescriptor {
label: Some("irradiance_pipeline".into()), label: Some("generator_linear_sampler"),
layout: vec![layouts.irradiance.clone()], address_mode_u: AddressMode::ClampToEdge,
push_constant_ranges: vec![], address_mode_v: AddressMode::ClampToEdge,
shader: load_embedded_asset!(world, "environment_filter.wgsl"), address_mode_w: AddressMode::ClampToEdge,
shader_defs: vec![], mag_filter: FilterMode::Linear,
entry_point: Some("generate_irradiance_map".into()), min_filter: FilterMode::Linear,
zero_initialize_workgroup_memory: false, mipmap_filter: FilterMode::Linear,
}); ..Default::default()
});
// Copy pipeline handles format conversion and populates mip0 when formats differ let samplers = GeneratorSamplers { linear };
let copy = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
label: Some("copy_mip0_pipeline".into()),
layout: vec![layouts.copy.clone()],
push_constant_ranges: vec![],
shader: load_embedded_asset!(world, "copy_mip0.wgsl"),
shader_defs: vec![],
entry_point: Some("copy_mip0".into()),
zero_initialize_workgroup_memory: false,
});
Self { // Pipelines
spd_first, let features = render_device.features();
spd_second, let shader_defs = if features.contains(WgpuFeatures::SUBGROUP) {
radiance, vec![ShaderDefVal::Int("SUBGROUP_SUPPORT".into(), 1)]
irradiance, } else {
copy, vec![]
} };
}
let spd_shader = load_embedded_asset!(asset_server.as_ref(), "spd.wgsl");
let env_filter_shader = load_embedded_asset!(asset_server.as_ref(), "environment_filter.wgsl");
let copy_shader = load_embedded_asset!(asset_server.as_ref(), "copy_mip0.wgsl");
// Single Pass Downsampling for Base Mip Levels (0-5)
let spd_first = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
label: Some("spd_first_pipeline".into()),
layout: vec![layouts.spd.clone()],
push_constant_ranges: vec![],
shader: spd_shader.clone(),
shader_defs: shader_defs.clone(),
entry_point: Some("spd_downsample_first".into()),
zero_initialize_workgroup_memory: false,
});
// Single Pass Downsampling for Remaining Mip Levels (6-12)
let spd_second = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
label: Some("spd_second_pipeline".into()),
layout: vec![layouts.spd.clone()],
push_constant_ranges: vec![],
shader: spd_shader,
shader_defs: shader_defs.clone(),
entry_point: Some("spd_downsample_second".into()),
zero_initialize_workgroup_memory: false,
});
// Radiance map for Specular Environment Maps
let radiance = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
label: Some("radiance_pipeline".into()),
layout: vec![layouts.radiance.clone()],
push_constant_ranges: vec![],
shader: env_filter_shader.clone(),
shader_defs: vec![],
entry_point: Some("generate_radiance_map".into()),
zero_initialize_workgroup_memory: false,
});
// Irradiance map for Diffuse Environment Maps
let irradiance = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
label: Some("irradiance_pipeline".into()),
layout: vec![layouts.irradiance.clone()],
push_constant_ranges: vec![],
shader: env_filter_shader,
shader_defs: vec![],
entry_point: Some("generate_irradiance_map".into()),
zero_initialize_workgroup_memory: false,
});
// Copy pipeline handles format conversion and populates mip0 when formats differ
let copy_pipeline = pipeline_cache.queue_compute_pipeline(ComputePipelineDescriptor {
label: Some("copy_mip0_pipeline".into()),
layout: vec![layouts.copy.clone()],
push_constant_ranges: vec![],
shader: copy_shader,
shader_defs: vec![],
entry_point: Some("copy_mip0".into()),
zero_initialize_workgroup_memory: false,
});
let pipelines = GeneratorPipelines {
spd_first,
spd_second,
radiance,
irradiance,
copy: copy_pipeline,
};
// Insert all resources into the render world
commands.insert_resource(layouts);
commands.insert_resource(samplers);
commands.insert_resource(pipelines);
} }
pub fn extract_generator_entities( pub fn extract_generator_entities(
@ -516,7 +511,7 @@ pub fn prepare_generator_bind_groups(
render_images: Res<RenderAssets<GpuImage>>, render_images: Res<RenderAssets<GpuImage>>,
mut commands: Commands, mut commands: Commands,
) { ) {
let stbn_texture = render_images.get(&SBTN).expect("STBN texture not loaded"); let stbn_texture = render_images.get(&STBN).expect("STBN texture not loaded");
let texture_size = Vec2::new( let texture_size = Vec2::new(
stbn_texture.size.width as f32, stbn_texture.size.width as f32,
stbn_texture.size.height as f32, stbn_texture.size.height as f32,

17
crates/bevy_pbr/src/light_probe/mod.rs
View File

@ -32,7 +32,7 @@ use bevy_render::{
sync_world::RenderEntity, sync_world::RenderEntity,
texture::{FallbackImage, GpuImage}, texture::{FallbackImage, GpuImage},
view::ExtractedView, view::ExtractedView,
Extract, ExtractSchedule, Render, RenderApp, RenderSystems, Extract, ExtractSchedule, Render, RenderApp, RenderStartup, RenderSystems,
}; };
use bevy_transform::{components::Transform, prelude::GlobalTransform}; use bevy_transform::{components::Transform, prelude::GlobalTransform};
use tracing::error; use tracing::error;
@ -41,9 +41,10 @@ use core::{hash::Hash, ops::Deref};
use crate::{ use crate::{
generate::{ generate::{
extract_generator_entities, generate_environment_map_light, prepare_generator_bind_groups, extract_generator_entities, generate_environment_map_light, init_generator_resources,
prepare_intermediate_textures, GeneratorBindGroupLayouts, GeneratorNode, prepare_generator_bind_groups, prepare_intermediate_textures, GeneratorBindGroupLayouts,
GeneratorPipelines, GeneratorSamplers, IrradianceMapNode, RadianceMapNode, SpdNode, SBTN, GeneratorNode, GeneratorPipelines, GeneratorSamplers, IrradianceMapNode, RadianceMapNode,
SpdNode, STBN,
}, },
light_probe::environment_map::EnvironmentMapIds, light_probe::environment_map::EnvironmentMapIds,
}; };
@ -305,7 +306,7 @@ impl Plugin for LightProbePlugin {
embedded_asset!(app, "spd.wgsl"); embedded_asset!(app, "spd.wgsl");
embedded_asset!(app, "copy_mip0.wgsl"); embedded_asset!(app, "copy_mip0.wgsl");
load_internal_binary_asset!(app, SBTN, "sbtn_vec2.png", |bytes, _: String| { load_internal_binary_asset!(app, STBN, "stbn_vec2.png", |bytes, _: String| {
Image::from_buffer( Image::from_buffer(
bytes, bytes,
ImageType::Extension("png"), ImageType::Extension("png"),
@ -328,9 +329,6 @@ impl Plugin for LightProbePlugin {
render_app render_app
.init_resource::<LightProbesBuffer>() .init_resource::<LightProbesBuffer>()
.init_resource::<EnvironmentMapUniformBuffer>() .init_resource::<EnvironmentMapUniformBuffer>()
.init_resource::<GeneratorBindGroupLayouts>()
.init_resource::<GeneratorSamplers>()
.init_resource::<GeneratorPipelines>()
.add_render_graph_node::<SpdNode>(Core3d, GeneratorNode::Mipmap) .add_render_graph_node::<SpdNode>(Core3d, GeneratorNode::Mipmap)
.add_render_graph_node::<RadianceMapNode>(Core3d, GeneratorNode::Radiance) .add_render_graph_node::<RadianceMapNode>(Core3d, GeneratorNode::Radiance)
.add_render_graph_node::<IrradianceMapNode>(Core3d, GeneratorNode::Irradiance) .add_render_graph_node::<IrradianceMapNode>(Core3d, GeneratorNode::Irradiance)
@ -363,7 +361,8 @@ impl Plugin for LightProbePlugin {
prepare_intermediate_textures, prepare_intermediate_textures,
) )
.in_set(RenderSystems::PrepareResources), .in_set(RenderSystems::PrepareResources),
); )
.add_systems(RenderStartup, init_generator_resources);
} }
} }

0
crates/bevy_pbr/src/light_probe/sbtn_vec2.png → crates/bevy_pbr/src/light_probe/stbn_vec2.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 44 KiB