Mirrors/bevy
2
0
Fork 0
mirror of https://github.com/bevyengine/bevy synced 2024-11-10 07:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Keep track of when a texture is first cleared (#10325)

Browse source 
# Objective
- Custom render passes, or future passes in the engine (such as
https://github.com/bevyengine/bevy/pull/10164) need a better way to know
and indicate to the core passes whether the view color/depth/prepass
attachments have been cleared or not yet this frame, to know if they
should clear it themselves or load it.

## Solution

- For all render targets (depth textures, shadow textures, prepass
textures, main textures) use an atomic bool to track whether or not each
texture has been cleared this frame. Abstracted away in the new
ColorAttachment and DepthAttachment wrappers.

---

## Changelog
- Changed `ViewTarget::get_color_attachment()`, removed arguments.
- Changed `ViewTarget::get_unsampled_color_attachment()`, removed
arguments.
- Removed `Camera3d::clear_color`.
- Removed `Camera2d::clear_color`.
- Added `Camera::clear_color`.
- Added `ExtractedCamera::clear_color`.
- Added `ColorAttachment` and `DepthAttachment` wrappers.
- Moved `ClearColor` and `ClearColorConfig` from
`bevy::core_pipeline::clear_color` to `bevy::render::camera`.
- Core render passes now track when a texture is first bound as an
attachment in order to decide whether to clear or load it.

## Migration Guide
- Remove arguments to `ViewTarget::get_color_attachment()` and
`ViewTarget::get_unsampled_color_attachment()`.
- Configure clear color on `Camera` instead of on `Camera3d` and
`Camera2d`.
- Moved `ClearColor` and `ClearColorConfig` from
`bevy::core_pipeline::clear_color` to `bevy::render::camera`.
- `ViewDepthTexture` must now be created via the `new()` method

---------

Co-authored-by: vero <email@atlasdostal.com>
Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
This commit is contained in:
JMS55 2023-12-30 16:37:37 -08:00 committed by GitHub
parent 3d3a065820
commit 70b0eacc3b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 374 additions and 413 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
crates/bevy_core_pipeline/src/bloom/mod.rs
View file

@ -265,12 +265,7 @@ impl ViewNode for BloomNode {
let mut upsampling_final_pass = let mut upsampling_final_pass =
render_context.begin_tracked_render_pass(RenderPassDescriptor { render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("bloom_upsampling_final_pass"), label: Some("bloom_upsampling_final_pass"),
color_attachments: &[Some(view_target.get_unsampled_color_attachment( color_attachments: &[Some(view_target.get_unsampled_color_attachment())],
Operations {
load: LoadOp::Load,
store: StoreOp::Store,
},
))],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,

13
crates/bevy_core_pipeline/src/core_2d/camera_2d.rs
View file

@ -1,7 +1,4 @@
use crate::{ use crate::tonemapping::{DebandDither, Tonemapping};
clear_color::ClearColorConfig,
tonemapping::{DebandDither, Tonemapping},
};
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_reflect::Reflect; use bevy_reflect::Reflect;
use bevy_render::{ use bevy_render::{
@ -15,9 +12,7 @@ use bevy_transform::prelude::{GlobalTransform, Transform};
#[derive(Component, Default, Reflect, Clone, ExtractComponent)] #[derive(Component, Default, Reflect, Clone, ExtractComponent)]
#[extract_component_filter(With<Camera>)] #[extract_component_filter(With<Camera>)]
#[reflect(Component)] #[reflect(Component)]
pub struct Camera2d { pub struct Camera2d;
pub clear_color: ClearColorConfig,
}
#[derive(Bundle)] #[derive(Bundle)]
pub struct Camera2dBundle { pub struct Camera2dBundle {
@ -57,7 +52,7 @@ impl Default for Camera2dBundle {
transform, transform,
global_transform: Default::default(), global_transform: Default::default(),
camera: Camera::default(), camera: Camera::default(),
camera_2d: Camera2d::default(), camera_2d: Camera2d,
tonemapping: Tonemapping::None, tonemapping: Tonemapping::None,
deband_dither: DebandDither::Disabled, deband_dither: DebandDither::Disabled,
} }
@ -95,7 +90,7 @@ impl Camera2dBundle {
transform, transform,
global_transform: Default::default(), global_transform: Default::default(),
camera: Camera::default(), camera: Camera::default(),
camera_2d: Camera2d::default(), camera_2d: Camera2d,
tonemapping: Tonemapping::None, tonemapping: Tonemapping::None,
deband_dither: DebandDither::Disabled, deband_dither: DebandDither::Disabled,
} }

28
crates/bevy_core_pipeline/src/core_2d/main_pass_2d_node.rs
View file

@ -1,13 +1,10 @@
use crate::{ use crate::core_2d::Transparent2d;
clear_color::{ClearColor, ClearColorConfig},
core_2d::{camera_2d::Camera2d, Transparent2d},
};
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_render::{ use bevy_render::{
camera::ExtractedCamera, camera::ExtractedCamera,
render_graph::{Node, NodeRunError, RenderGraphContext}, render_graph::{Node, NodeRunError, RenderGraphContext},
render_phase::RenderPhase, render_phase::RenderPhase,
render_resource::{LoadOp, Operations, RenderPassDescriptor, StoreOp}, render_resource::RenderPassDescriptor,
renderer::RenderContext, renderer::RenderContext,
view::{ExtractedView, ViewTarget}, view::{ExtractedView, ViewTarget},
}; };
@ -20,7 +17,6 @@ pub struct MainPass2dNode {
&'static ExtractedCamera, &'static ExtractedCamera,
&'static RenderPhase<Transparent2d>, &'static RenderPhase<Transparent2d>,
&'static ViewTarget, &'static ViewTarget,
&'static Camera2d,
), ),
With<ExtractedView>, With<ExtractedView>,
>, >,
@ -46,28 +42,19 @@ impl Node for MainPass2dNode {
world: &World, world: &World,
) -> Result<(), NodeRunError> { ) -> Result<(), NodeRunError> {
let view_entity = graph.view_entity(); let view_entity = graph.view_entity();
let Ok((camera, transparent_phase, target, camera_2d)) = let Ok((camera, transparent_phase, target)) = self.query.get_manual(world, view_entity)
self.query.get_manual(world, view_entity)
else { else {
// no target // no target
return Ok(()); return Ok(());
}; };
{ {
#[cfg(feature = "trace")] #[cfg(feature = "trace")]
let _main_pass_2d = info_span!("main_pass_2d").entered(); let _main_pass_2d = info_span!("main_pass_2d").entered();
let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor { let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("main_pass_2d"), label: Some("main_pass_2d"),
color_attachments: &[Some(target.get_color_attachment(Operations { color_attachments: &[Some(target.get_color_attachment())],
load: match camera_2d.clear_color {
ClearColorConfig::Default => {
LoadOp::Clear(world.resource::<ClearColor>().0.into())
}
ClearColorConfig::Custom(color) => LoadOp::Clear(color.into()),
ClearColorConfig::None => LoadOp::Load,
},
store: StoreOp::Store,
}))],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,
@ -88,10 +75,7 @@ impl Node for MainPass2dNode {
let _reset_viewport_pass_2d = info_span!("reset_viewport_pass_2d").entered(); let _reset_viewport_pass_2d = info_span!("reset_viewport_pass_2d").entered();
let pass_descriptor = RenderPassDescriptor { let pass_descriptor = RenderPassDescriptor {
label: Some("reset_viewport_pass_2d"), label: Some("reset_viewport_pass_2d"),
color_attachments: &[Some(target.get_color_attachment(Operations { color_attachments: &[Some(target.get_color_attachment())],
load: LoadOp::Load,
store: StoreOp::Store,
}))],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,

10
crates/bevy_core_pipeline/src/core_3d/camera_3d.rs
View file

@ -1,7 +1,4 @@
use crate::{ use crate::tonemapping::{DebandDither, Tonemapping};
clear_color::ClearColorConfig,
tonemapping::{DebandDither, Tonemapping},
};
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize}; use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize};
use bevy_render::{ use bevy_render::{
@ -19,8 +16,6 @@ use serde::{Deserialize, Serialize};
#[extract_component_filter(With<Camera>)] #[extract_component_filter(With<Camera>)]
#[reflect(Component)] #[reflect(Component)]
pub struct Camera3d { pub struct Camera3d {
/// The clear color operation to perform for the main 3d pass.
pub clear_color: ClearColorConfig,
/// The depth clear operation to perform for the main 3d pass. /// The depth clear operation to perform for the main 3d pass.
pub depth_load_op: Camera3dDepthLoadOp, pub depth_load_op: Camera3dDepthLoadOp,
/// The texture usages for the depth texture created for the main 3d pass. /// The texture usages for the depth texture created for the main 3d pass.
@ -37,7 +32,7 @@ pub struct Camera3d {
/// regardless of this setting. /// regardless of this setting.
/// - Setting this to `0` disables the screen-space refraction effect entirely, and falls /// - Setting this to `0` disables the screen-space refraction effect entirely, and falls
/// back to refracting only the environment map light's texture. /// back to refracting only the environment map light's texture.
/// - If set to more than `0`, any opaque [`clear_color`](Camera3d::clear_color) will obscure the environment /// - If set to more than `0`, any opaque [`clear_color`](Camera::clear_color) will obscure the environment
/// map light's texture, preventing it from being visible “through” transmissive materials. If you'd like /// map light's texture, preventing it from being visible “through” transmissive materials. If you'd like
/// to still have the environment map show up in your refractions, you can set the clear color's alpha to `0.0`. /// to still have the environment map show up in your refractions, you can set the clear color's alpha to `0.0`.
/// Keep in mind that depending on the platform and your window settings, this may cause the window to become /// Keep in mind that depending on the platform and your window settings, this may cause the window to become
@ -55,7 +50,6 @@ pub struct Camera3d {
impl Default for Camera3d { impl Default for Camera3d {
fn default() -> Self { fn default() -> Self {
Self { Self {
clear_color: ClearColorConfig::Default,
depth_load_op: Default::default(), depth_load_op: Default::default(),
depth_texture_usages: TextureUsages::RENDER_ATTACHMENT.into(), depth_texture_usages: TextureUsages::RENDER_ATTACHMENT.into(),
screen_space_specular_transmission_steps: 1, screen_space_specular_transmission_steps: 1,

61
crates/bevy_core_pipeline/src/core_3d/main_opaque_pass_3d_node.rs
View file

@ -1,7 +1,5 @@
use crate::{ use crate::{
clear_color::{ClearColor, ClearColorConfig}, core_3d::Opaque3d,
core_3d::{Camera3d, Opaque3d},
prepass::{DeferredPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass},
skybox::{SkyboxBindGroup, SkyboxPipelineId}, skybox::{SkyboxBindGroup, SkyboxPipelineId},
}; };
use bevy_ecs::{prelude::World, query::QueryItem}; use bevy_ecs::{prelude::World, query::QueryItem};
@ -9,17 +7,14 @@ use bevy_render::{
camera::ExtractedCamera, camera::ExtractedCamera,
render_graph::{NodeRunError, RenderGraphContext, ViewNode}, render_graph::{NodeRunError, RenderGraphContext, ViewNode},
render_phase::RenderPhase, render_phase::RenderPhase,
render_resource::{ render_resource::{PipelineCache, RenderPassDescriptor, StoreOp},
LoadOp, Operations, PipelineCache, RenderPassDepthStencilAttachment, RenderPassDescriptor,
StoreOp,
},
renderer::RenderContext, renderer::RenderContext,
view::{ViewDepthTexture, ViewTarget, ViewUniformOffset}, view::{ViewDepthTexture, ViewTarget, ViewUniformOffset},
}; };
#[cfg(feature = "trace")] #[cfg(feature = "trace")]
use bevy_utils::tracing::info_span; use bevy_utils::tracing::info_span;
use super::{AlphaMask3d, Camera3dDepthLoadOp}; use super::AlphaMask3d;
/// A [`bevy_render::render_graph::Node`] that runs the [`Opaque3d`] and [`AlphaMask3d`] [`RenderPhase`]. /// A [`bevy_render::render_graph::Node`] that runs the [`Opaque3d`] and [`AlphaMask3d`] [`RenderPhase`].
#[derive(Default)] #[derive(Default)]
@ -29,13 +24,8 @@ impl ViewNode for MainOpaquePass3dNode {
&'static ExtractedCamera, &'static ExtractedCamera,
&'static RenderPhase<Opaque3d>, &'static RenderPhase<Opaque3d>,
&'static RenderPhase<AlphaMask3d>, &'static RenderPhase<AlphaMask3d>,
&'static Camera3d,
&'static ViewTarget, &'static ViewTarget,
&'static ViewDepthTexture, &'static ViewDepthTexture,
Option<&'static DepthPrepass>,
Option<&'static NormalPrepass>,
Option<&'static MotionVectorPrepass>,
Option<&'static DeferredPrepass>,
Option<&'static SkyboxPipelineId>, Option<&'static SkyboxPipelineId>,
Option<&'static SkyboxBindGroup>, Option<&'static SkyboxBindGroup>,
&'static ViewUniformOffset, &'static ViewUniformOffset,
@ -49,30 +39,14 @@ impl ViewNode for MainOpaquePass3dNode {
camera, camera,
opaque_phase, opaque_phase,
alpha_mask_phase, alpha_mask_phase,
camera_3d,
target, target,
depth, depth,
depth_prepass,
normal_prepass,
motion_vector_prepass,
deferred_prepass,
skybox_pipeline, skybox_pipeline,
skybox_bind_group, skybox_bind_group,
view_uniform_offset, view_uniform_offset,
): QueryItem<Self::ViewData>, ): QueryItem<Self::ViewData>,
world: &World, world: &World,
) -> Result<(), NodeRunError> { ) -> Result<(), NodeRunError> {
let load = if deferred_prepass.is_none() {
match camera_3d.clear_color {
ClearColorConfig::Default => LoadOp::Clear(world.resource::<ClearColor>().0.into()),
ClearColorConfig::Custom(color) => LoadOp::Clear(color.into()),
ClearColorConfig::None => LoadOp::Load,
}
} else {
// If the deferred lighting pass has run, don't clear again in this pass.
LoadOp::Load
};
// Run the opaque pass, sorted front-to-back // Run the opaque pass, sorted front-to-back
// NOTE: Scoped to drop the mutable borrow of render_context // NOTE: Scoped to drop the mutable borrow of render_context
#[cfg(feature = "trace")] #[cfg(feature = "trace")]
@ -81,33 +55,8 @@ impl ViewNode for MainOpaquePass3dNode {
// Setup render pass // Setup render pass
let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor { let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("main_opaque_pass_3d"), label: Some("main_opaque_pass_3d"),
// NOTE: The opaque pass loads the color color_attachments: &[Some(target.get_color_attachment())],
// buffer as well as writing to it. depth_stencil_attachment: Some(depth.get_attachment(StoreOp::Store)),
color_attachments: &[Some(target.get_color_attachment(Operations {
load,
store: StoreOp::Store,
}))],
depth_stencil_attachment: Some(RenderPassDepthStencilAttachment {
view: &depth.view,
// NOTE: The opaque main pass loads the depth buffer and possibly overwrites it
depth_ops: Some(Operations {
load: if depth_prepass.is_some()
|| normal_prepass.is_some()
|| motion_vector_prepass.is_some()
|| deferred_prepass.is_some()
{
// if any prepass runs, it will generate a depth buffer so we should use it,
// even if only the normal_prepass is used.
Camera3dDepthLoadOp::Load
} else {
// NOTE: 0.0 is the far plane due to bevy's use of reverse-z projections.
camera_3d.depth_load_op.clone()
}
.into(),
store: StoreOp::Store,
}),
stencil_ops: None,
}),
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,
}); });

21
crates/bevy_core_pipeline/src/core_3d/main_transmissive_pass_3d_node.rs
View file

@ -5,10 +5,7 @@ use bevy_render::{
camera::ExtractedCamera, camera::ExtractedCamera,
render_graph::{NodeRunError, RenderGraphContext, ViewNode}, render_graph::{NodeRunError, RenderGraphContext, ViewNode},
render_phase::RenderPhase, render_phase::RenderPhase,
render_resource::{ render_resource::{Extent3d, RenderPassDescriptor, StoreOp},
Extent3d, LoadOp, Operations, RenderPassDepthStencilAttachment, RenderPassDescriptor,
StoreOp,
},
renderer::RenderContext, renderer::RenderContext,
view::{ViewDepthTexture, ViewTarget}, view::{ViewDepthTexture, ViewTarget},
}; };
@ -45,20 +42,8 @@ impl ViewNode for MainTransmissivePass3dNode {
let render_pass_descriptor = RenderPassDescriptor { let render_pass_descriptor = RenderPassDescriptor {
label: Some("main_transmissive_pass_3d"), label: Some("main_transmissive_pass_3d"),
// NOTE: The transmissive pass loads the color buffer as well as overwriting it where appropriate. color_attachments: &[Some(target.get_color_attachment())],
color_attachments: &[Some(target.get_color_attachment(Operations { depth_stencil_attachment: Some(depth.get_attachment(StoreOp::Store)),
load: LoadOp::Load,
store: StoreOp::Store,
}))],
depth_stencil_attachment: Some(RenderPassDepthStencilAttachment {
view: &depth.view,
// NOTE: The transmissive main pass loads the depth buffer and possibly overwrites it
depth_ops: Some(Operations {
load: LoadOp::Load,
store: StoreOp::Store,
}),
stencil_ops: None,
}),
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,
}; };

36
crates/bevy_core_pipeline/src/core_3d/main_transparent_pass_3d_node.rs
View file

@ -4,9 +4,7 @@ use bevy_render::{
camera::ExtractedCamera, camera::ExtractedCamera,
render_graph::{NodeRunError, RenderGraphContext, ViewNode}, render_graph::{NodeRunError, RenderGraphContext, ViewNode},
render_phase::RenderPhase, render_phase::RenderPhase,
render_resource::{ render_resource::{RenderPassDescriptor, StoreOp},
LoadOp, Operations, RenderPassDepthStencilAttachment, RenderPassDescriptor, StoreOp,
},
renderer::RenderContext, renderer::RenderContext,
view::{ViewDepthTexture, ViewTarget}, view::{ViewDepthTexture, ViewTarget},
}; };
@ -41,25 +39,14 @@ impl ViewNode for MainTransparentPass3dNode {
let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor { let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("main_transparent_pass_3d"), label: Some("main_transparent_pass_3d"),
// NOTE: The transparent pass loads the color buffer as well as overwriting it where appropriate. color_attachments: &[Some(target.get_color_attachment())],
color_attachments: &[Some(target.get_color_attachment(Operations { // NOTE: For the transparent pass we load the depth buffer. There should be no
load: LoadOp::Load, // need to write to it, but store is set to `true` as a workaround for issue #3776,
store: StoreOp::Store, // https://github.com/bevyengine/bevy/issues/3776
}))], // so that wgpu does not clear the depth buffer.
depth_stencil_attachment: Some(RenderPassDepthStencilAttachment { // As the opaque and alpha mask passes run first, opaque meshes can occlude
view: &depth.view, // transparent ones.
// NOTE: For the transparent pass we load the depth buffer. There should be no depth_stencil_attachment: Some(depth.get_attachment(StoreOp::Store)),
// need to write to it, but store is set to `true` as a workaround for issue #3776,
// https://github.com/bevyengine/bevy/issues/3776
// so that wgpu does not clear the depth buffer.
// As the opaque and alpha mask passes run first, opaque meshes can occlude
// transparent ones.
depth_ops: Some(Operations {
load: LoadOp::Load,
store: StoreOp::Store,
}),
stencil_ops: None,
}),
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,
}); });
@ -79,10 +66,7 @@ impl ViewNode for MainTransparentPass3dNode {
let _reset_viewport_pass_3d = info_span!("reset_viewport_pass_3d").entered(); let _reset_viewport_pass_3d = info_span!("reset_viewport_pass_3d").entered();
let pass_descriptor = RenderPassDescriptor { let pass_descriptor = RenderPassDescriptor {
label: Some("reset_viewport_pass_3d"), label: Some("reset_viewport_pass_3d"),
color_attachments: &[Some(target.get_color_attachment(Operations { color_attachments: &[Some(target.get_color_attachment())],
load: LoadOp::Load,
store: StoreOp::Store,
}))],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,

28
crates/bevy_core_pipeline/src/core_3d/mod.rs
View file

@ -42,6 +42,7 @@ use bevy_app::{App, Plugin, PostUpdate};
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_render::{ use bevy_render::{
camera::{Camera, ExtractedCamera}, camera::{Camera, ExtractedCamera},
color::Color,
extract_component::ExtractComponentPlugin, extract_component::ExtractComponentPlugin,
prelude::Msaa, prelude::Msaa,
render_graph::{EmptyNode, RenderGraphApp, ViewNodeRunner}, render_graph::{EmptyNode, RenderGraphApp, ViewNodeRunner},
@ -54,7 +55,7 @@ use bevy_render::{
TextureDescriptor, TextureDimension, TextureFormat, TextureUsages, TextureView, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages, TextureView,
}, },
renderer::RenderDevice, renderer::RenderDevice,
texture::{BevyDefault, TextureCache}, texture::{BevyDefault, ColorAttachment, TextureCache},
view::{ExtractedView, ViewDepthTexture, ViewTarget}, view::{ExtractedView, ViewDepthTexture, ViewTarget},
Extract, ExtractSchedule, Render, RenderApp, RenderSet, Extract, ExtractSchedule, Render, RenderApp, RenderSet,
}; };
@ -526,7 +527,7 @@ pub fn prepare_core_3d_depth_textures(
} }
let mut textures = HashMap::default(); let mut textures = HashMap::default();
for (entity, camera, _, _) in &views_3d { for (entity, camera, _, camera_3d) in &views_3d {
let Some(physical_target_size) = camera.physical_target_size else { let Some(physical_target_size) = camera.physical_target_size else {
continue; continue;
}; };
@ -560,10 +561,13 @@ pub fn prepare_core_3d_depth_textures(
}) })
.clone(); .clone();
commands.entity(entity).insert(ViewDepthTexture { commands.entity(entity).insert(ViewDepthTexture::new(
texture: cached_texture.texture, cached_texture,
view: cached_texture.default_view, match camera_3d.depth_load_op {
}); Camera3dDepthLoadOp::Clear(v) => Some(v),
Camera3dDepthLoadOp::Load => None,
},
));
} }
} }
@ -824,10 +828,14 @@ pub fn prepare_prepass_textures(
}); });
commands.entity(entity).insert(ViewPrepassTextures { commands.entity(entity).insert(ViewPrepassTextures {
depth: cached_depth_texture, depth: cached_depth_texture.map(|t| ColorAttachment::new(t, None, Color::BLACK)),
normal: cached_normals_texture, normal: cached_normals_texture.map(|t| ColorAttachment::new(t, None, Color::BLACK)),
motion_vectors: cached_motion_vectors_texture, // Red and Green channels are X and Y components of the motion vectors
deferred: cached_deferred_texture, // Blue channel doesn't matter, but set to 0.0 for possible faster clear
// https://gpuopen.com/performance/#clears
motion_vectors: cached_motion_vectors_texture
.map(|t| ColorAttachment::new(t, None, Color::BLACK)),
deferred: cached_deferred_texture.map(|t| ColorAttachment::new(t, None, Color::BLACK)),
deferred_lighting_pass_id: deferred_lighting_pass_id_texture, deferred_lighting_pass_id: deferred_lighting_pass_id_texture,
size, size,
}); });

102
crates/bevy_core_pipeline/src/deferred/node.rs
View file

@ -8,18 +8,14 @@ use bevy_render::{
prelude::Color, prelude::Color,
render_graph::{NodeRunError, RenderGraphContext}, render_graph::{NodeRunError, RenderGraphContext},
render_phase::RenderPhase, render_phase::RenderPhase,
render_resource::{ render_resource::{LoadOp, Operations, RenderPassColorAttachment, RenderPassDescriptor},
LoadOp, Operations, RenderPassColorAttachment, RenderPassDepthStencilAttachment,
RenderPassDescriptor,
},
renderer::RenderContext, renderer::RenderContext,
view::ViewDepthTexture, view::ViewDepthTexture,
}; };
#[cfg(feature = "trace")] #[cfg(feature = "trace")]
use bevy_utils::tracing::info_span; use bevy_utils::tracing::info_span;
use crate::core_3d::{Camera3d, Camera3dDepthLoadOp}; use crate::prepass::ViewPrepassTextures;
use crate::prepass::{DepthPrepass, MotionVectorPrepass, NormalPrepass, ViewPrepassTextures};
use super::{AlphaMask3dDeferred, Opaque3dDeferred}; use super::{AlphaMask3dDeferred, Opaque3dDeferred};
@ -36,10 +32,6 @@ impl ViewNode for DeferredGBufferPrepassNode {
&'static RenderPhase<AlphaMask3dDeferred>, &'static RenderPhase<AlphaMask3dDeferred>,
&'static ViewDepthTexture, &'static ViewDepthTexture,
&'static ViewPrepassTextures, &'static ViewPrepassTextures,
&'static Camera3d,
Option<&'static DepthPrepass>,
Option<&'static NormalPrepass>,
Option<&'static MotionVectorPrepass>,
); );
fn run( fn run(
@ -52,10 +44,6 @@ impl ViewNode for DeferredGBufferPrepassNode {
alpha_mask_deferred_phase, alpha_mask_deferred_phase,
view_depth_texture, view_depth_texture,
view_prepass_textures, view_prepass_textures,
camera_3d,
depth_prepass,
normal_prepass,
motion_vector_prepass,
): QueryItem<Self::ViewData>, ): QueryItem<Self::ViewData>,
world: &World, world: &World,
) -> Result<(), NodeRunError> { ) -> Result<(), NodeRunError> {
@ -66,37 +54,14 @@ impl ViewNode for DeferredGBufferPrepassNode {
view_prepass_textures view_prepass_textures
.normal .normal
.as_ref() .as_ref()
.map(|view_normals_texture| RenderPassColorAttachment { .map(|normals_texture| normals_texture.get_attachment()),
view: &view_normals_texture.default_view, );
resolve_target: None, color_attachments.push(
ops: Operations { view_prepass_textures
load: if normal_prepass.is_some() { .motion_vectors
// Load if the normal_prepass has already run. .as_ref()
// The prepass will have already cleared this for the current frame. .map(|motion_vectors_texture| motion_vectors_texture.get_attachment()),
LoadOp::Load
} else {
LoadOp::Clear(Color::BLACK.into())
},
store: StoreOp::Store,
},
}),
); );
color_attachments.push(view_prepass_textures.motion_vectors.as_ref().map(
|view_motion_vectors_texture| RenderPassColorAttachment {
view: &view_motion_vectors_texture.default_view,
resolve_target: None,
ops: Operations {
load: if motion_vector_prepass.is_some() {
// Load if the motion_vector_prepass has already run.
// The prepass will have already cleared this for the current frame.
LoadOp::Load
} else {
LoadOp::Clear(Color::BLACK.into())
},
store: StoreOp::Store,
},
},
));
// If we clear the deferred texture with LoadOp::Clear(Default::default()) we get these errors: // If we clear the deferred texture with LoadOp::Clear(Default::default()) we get these errors:
// Chrome: GL_INVALID_OPERATION: No defined conversion between clear value and attachment format. // Chrome: GL_INVALID_OPERATION: No defined conversion between clear value and attachment format.
@ -106,7 +71,7 @@ impl ViewNode for DeferredGBufferPrepassNode {
#[cfg(all(feature = "webgl", target_arch = "wasm32"))] #[cfg(all(feature = "webgl", target_arch = "wasm32"))]
if let Some(deferred_texture) = &view_prepass_textures.deferred { if let Some(deferred_texture) = &view_prepass_textures.deferred {
render_context.command_encoder().clear_texture( render_context.command_encoder().clear_texture(
&deferred_texture.texture, &deferred_texture.texture.texture,
&bevy_render::render_resource::ImageSubresourceRange::default(), &bevy_render::render_resource::ImageSubresourceRange::default(),
); );
} }
@ -115,16 +80,20 @@ impl ViewNode for DeferredGBufferPrepassNode {
view_prepass_textures view_prepass_textures
.deferred .deferred
.as_ref() .as_ref()
.map(|deferred_texture| RenderPassColorAttachment { .map(|deferred_texture| {
view: &deferred_texture.default_view, #[cfg(all(feature = "webgl", target_arch = "wasm32"))]
resolve_target: None, {
ops: Operations { RenderPassColorAttachment {
#[cfg(all(feature = "webgl", target_arch = "wasm32"))] view: &deferred_texture.texture.default_view,
load: LoadOp::Load, resolve_target: None,
#[cfg(not(all(feature = "webgl", target_arch = "wasm32")))] ops: Operations {
load: LoadOp::Clear(Default::default()), load: LoadOp::Load,
store: StoreOp::Store, store: StoreOp::Store,
}, },
}
}
#[cfg(not(all(feature = "webgl", target_arch = "wasm32")))]
deferred_texture.get_attachment()
}), }),
); );
@ -136,7 +105,7 @@ impl ViewNode for DeferredGBufferPrepassNode {
view: &deferred_lighting_pass_id.default_view, view: &deferred_lighting_pass_id.default_view,
resolve_target: None, resolve_target: None,
ops: Operations { ops: Operations {
load: LoadOp::Clear(Default::default()), load: LoadOp::Clear(Color::BLACK.into()),
store: StoreOp::Store, store: StoreOp::Store,
}, },
}), }),
@ -152,24 +121,7 @@ impl ViewNode for DeferredGBufferPrepassNode {
let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor { let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("deferred"), label: Some("deferred"),
color_attachments: &color_attachments, color_attachments: &color_attachments,
depth_stencil_attachment: Some(RenderPassDepthStencilAttachment { depth_stencil_attachment: Some(view_depth_texture.get_attachment(StoreOp::Store)),
view: &view_depth_texture.view,
depth_ops: Some(Operations {
load: if depth_prepass.is_some()
|| normal_prepass.is_some()
|| motion_vector_prepass.is_some()
{
// If any prepass runs, it will generate a depth buffer so we should use it.
Camera3dDepthLoadOp::Load
} else {
// NOTE: 0.0 is the far plane due to bevy's use of reverse-z projections.
camera_3d.depth_load_op.clone()
}
.into(),
store: StoreOp::Store,
}),
stencil_ops: None,
}),
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,
}); });
@ -198,7 +150,7 @@ impl ViewNode for DeferredGBufferPrepassNode {
// Copy depth buffer to texture. // Copy depth buffer to texture.
render_context.command_encoder().copy_texture_to_texture( render_context.command_encoder().copy_texture_to_texture(
view_depth_texture.texture.as_image_copy(), view_depth_texture.texture.as_image_copy(),
prepass_depth_texture.texture.as_image_copy(), prepass_depth_texture.texture.texture.as_image_copy(),
view_prepass_textures.size, view_prepass_textures.size,
); );
} }

15
crates/bevy_core_pipeline/src/lib.rs
View file

@ -1,6 +1,5 @@
pub mod blit; pub mod blit;
pub mod bloom; pub mod bloom;
pub mod clear_color;
pub mod contrast_adaptive_sharpening; pub mod contrast_adaptive_sharpening;
pub mod core_2d; pub mod core_2d;
pub mod core_3d; pub mod core_3d;
@ -29,7 +28,6 @@ pub mod experimental {
pub mod prelude { pub mod prelude {
#[doc(hidden)] #[doc(hidden)]
pub use crate::{ pub use crate::{
clear_color::ClearColor,
core_2d::{Camera2d, Camera2dBundle}, core_2d::{Camera2d, Camera2dBundle},
core_3d::{Camera3d, Camera3dBundle}, core_3d::{Camera3d, Camera3dBundle},
}; };
@ -38,7 +36,6 @@ pub mod prelude {
use crate::{ use crate::{
blit::BlitPlugin, blit::BlitPlugin,
bloom::BloomPlugin, bloom::BloomPlugin,
clear_color::{ClearColor, ClearColorConfig},
contrast_adaptive_sharpening::CASPlugin, contrast_adaptive_sharpening::CASPlugin,
core_2d::Core2dPlugin, core_2d::Core2dPlugin,
core_3d::Core3dPlugin, core_3d::Core3dPlugin,
@ -46,13 +43,13 @@ use crate::{
fullscreen_vertex_shader::FULLSCREEN_SHADER_HANDLE, fullscreen_vertex_shader::FULLSCREEN_SHADER_HANDLE,
fxaa::FxaaPlugin, fxaa::FxaaPlugin,
msaa_writeback::MsaaWritebackPlugin, msaa_writeback::MsaaWritebackPlugin,
prepass::{DepthPrepass, NormalPrepass}, prepass::{DeferredPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass},
tonemapping::TonemappingPlugin, tonemapping::TonemappingPlugin,
upscaling::UpscalingPlugin, upscaling::UpscalingPlugin,
}; };
use bevy_app::{App, Plugin}; use bevy_app::{App, Plugin};
use bevy_asset::load_internal_asset; use bevy_asset::load_internal_asset;
use bevy_render::{extract_resource::ExtractResourcePlugin, prelude::Shader}; use bevy_render::prelude::Shader;
#[derive(Default)] #[derive(Default)]
pub struct CorePipelinePlugin; pub struct CorePipelinePlugin;
@ -66,13 +63,11 @@ impl Plugin for CorePipelinePlugin {
Shader::from_wgsl Shader::from_wgsl
); );
app.register_type::<ClearColor>() app.register_type::<DepthPrepass>()
.register_type::<ClearColorConfig>()
.register_type::<DepthPrepass>()
.register_type::<NormalPrepass>() .register_type::<NormalPrepass>()
.init_resource::<ClearColor>() .register_type::<MotionVectorPrepass>()
.register_type::<DeferredPrepass>()
.add_plugins(( .add_plugins((
ExtractResourcePlugin::<ClearColor>::default(),
Core2dPlugin, Core2dPlugin,
Core3dPlugin, Core3dPlugin,
CopyDeferredLightingIdPlugin, CopyDeferredLightingIdPlugin,

22
crates/bevy_core_pipeline/src/msaa_writeback.rs
View file

@ -7,6 +7,7 @@ use bevy_app::{App, Plugin};
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_render::{ use bevy_render::{
camera::ExtractedCamera, camera::ExtractedCamera,
color::Color,
render_graph::{Node, NodeRunError, RenderGraphApp, RenderGraphContext}, render_graph::{Node, NodeRunError, RenderGraphApp, RenderGraphContext},
render_resource::BindGroupEntries, render_resource::BindGroupEntries,
renderer::RenderContext, renderer::RenderContext,
@ -60,12 +61,17 @@ impl Node for MsaaWritebackNode {
fn update(&mut self, world: &mut World) { fn update(&mut self, world: &mut World) {
self.cameras.update_archetypes(world); self.cameras.update_archetypes(world);
} }
fn run( fn run(
&self, &self,
graph: &mut RenderGraphContext, graph: &mut RenderGraphContext,
render_context: &mut RenderContext, render_context: &mut RenderContext,
world: &World, world: &World,
) -> Result<(), NodeRunError> { ) -> Result<(), NodeRunError> {
if *world.resource::<Msaa>() == Msaa::Off {
return Ok(());
}
let view_entity = graph.view_entity(); let view_entity = graph.view_entity();
if let Ok((target, blit_pipeline_id)) = self.cameras.get_manual(world, view_entity) { if let Ok((target, blit_pipeline_id)) = self.cameras.get_manual(world, view_entity) {
let blit_pipeline = world.resource::<BlitPipeline>(); let blit_pipeline = world.resource::<BlitPipeline>();
@ -81,13 +87,18 @@ impl Node for MsaaWritebackNode {
let pass_descriptor = RenderPassDescriptor { let pass_descriptor = RenderPassDescriptor {
label: Some("msaa_writeback"), label: Some("msaa_writeback"),
// The target's "resolve target" is the "destination" in post_process // The target's "resolve target" is the "destination" in post_process.
// We will indirectly write the results to the "destination" using // We will indirectly write the results to the "destination" using
// the MSAA resolve step. // the MSAA resolve step.
color_attachments: &[Some(target.get_color_attachment(Operations { color_attachments: &[Some(RenderPassColorAttachment {
load: LoadOp::Clear(Default::default()), // If MSAA is enabled, then the sampled texture will always exist
store: StoreOp::Store, view: target.sampled_main_texture_view().unwrap(),
}))], resolve_target: Some(post_process.destination),
ops: Operations {
load: LoadOp::Clear(Color::BLACK.into()),
store: StoreOp::Store,
},
})],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,
@ -107,6 +118,7 @@ impl Node for MsaaWritebackNode {
render_pass.set_bind_group(0, &bind_group, &[]); render_pass.set_bind_group(0, &bind_group, &[]);
render_pass.draw(0..3, 0..1); render_pass.draw(0..3, 0..1);
} }
Ok(()) Ok(())
} }
} }

32
crates/bevy_core_pipeline/src/prepass/mod.rs
View file

@ -33,8 +33,8 @@ use bevy_ecs::prelude::*;
use bevy_reflect::Reflect; use bevy_reflect::Reflect;
use bevy_render::{ use bevy_render::{
render_phase::{CachedRenderPipelinePhaseItem, DrawFunctionId, PhaseItem}, render_phase::{CachedRenderPipelinePhaseItem, DrawFunctionId, PhaseItem},
render_resource::{CachedRenderPipelineId, Extent3d, TextureFormat}, render_resource::{CachedRenderPipelineId, Extent3d, TextureFormat, TextureView},
texture::CachedTexture, texture::{CachedTexture, ColorAttachment},
}; };
use bevy_utils::{nonmax::NonMaxU32, FloatOrd}; use bevy_utils::{nonmax::NonMaxU32, FloatOrd};
@ -66,16 +66,16 @@ pub struct DeferredPrepass;
pub struct ViewPrepassTextures { pub struct ViewPrepassTextures {
/// The depth texture generated by the prepass. /// The depth texture generated by the prepass.
/// Exists only if [`DepthPrepass`] is added to the [`ViewTarget`](bevy_render::view::ViewTarget) /// Exists only if [`DepthPrepass`] is added to the [`ViewTarget`](bevy_render::view::ViewTarget)
pub depth: Option<CachedTexture>, pub depth: Option<ColorAttachment>,
/// The normals texture generated by the prepass. /// The normals texture generated by the prepass.
/// Exists only if [`NormalPrepass`] is added to the [`ViewTarget`](bevy_render::view::ViewTarget) /// Exists only if [`NormalPrepass`] is added to the [`ViewTarget`](bevy_render::view::ViewTarget)
pub normal: Option<CachedTexture>, pub normal: Option<ColorAttachment>,
/// The motion vectors texture generated by the prepass. /// The motion vectors texture generated by the prepass.
/// Exists only if [`MotionVectorPrepass`] is added to the `ViewTarget` /// Exists only if [`MotionVectorPrepass`] is added to the `ViewTarget`
pub motion_vectors: Option<CachedTexture>, pub motion_vectors: Option<ColorAttachment>,
/// The deferred gbuffer generated by the deferred pass. /// The deferred gbuffer generated by the deferred pass.
/// Exists only if [`DeferredPrepass`] is added to the `ViewTarget` /// Exists only if [`DeferredPrepass`] is added to the `ViewTarget`
pub deferred: Option<CachedTexture>, pub deferred: Option<ColorAttachment>,
/// A texture that specifies the deferred lighting pass id for a material. /// A texture that specifies the deferred lighting pass id for a material.
/// Exists only if [`DeferredPrepass`] is added to the `ViewTarget` /// Exists only if [`DeferredPrepass`] is added to the `ViewTarget`
pub deferred_lighting_pass_id: Option<CachedTexture>, pub deferred_lighting_pass_id: Option<CachedTexture>,
@ -83,6 +83,26 @@ pub struct ViewPrepassTextures {
pub size: Extent3d, pub size: Extent3d,
} }
impl ViewPrepassTextures {
pub fn depth_view(&self) -> Option<&TextureView> {
self.depth.as_ref().map(|t| &t.texture.default_view)
}
pub fn normal_view(&self) -> Option<&TextureView> {
self.normal.as_ref().map(|t| &t.texture.default_view)
}
pub fn motion_vectors_view(&self) -> Option<&TextureView> {
self.motion_vectors
.as_ref()
.map(|t| &t.texture.default_view)
}
pub fn deferred_view(&self) -> Option<&TextureView> {
self.deferred.as_ref().map(|t| &t.texture.default_view)
}
}
/// Opaque phase of the 3D prepass. /// Opaque phase of the 3D prepass.
/// ///
/// Sorted front-to-back by the z-distance in front of the camera. /// Sorted front-to-back by the z-distance in front of the camera.

38
crates/bevy_core_pipeline/src/prepass/node.rs
View file

@ -4,13 +4,9 @@ use bevy_render::render_graph::ViewNode;
use bevy_render::render_resource::StoreOp; use bevy_render::render_resource::StoreOp;
use bevy_render::{ use bevy_render::{
camera::ExtractedCamera, camera::ExtractedCamera,
prelude::Color,
render_graph::{NodeRunError, RenderGraphContext}, render_graph::{NodeRunError, RenderGraphContext},
render_phase::RenderPhase, render_phase::RenderPhase,
render_resource::{ render_resource::RenderPassDescriptor,
LoadOp, Operations, RenderPassColorAttachment, RenderPassDepthStencilAttachment,
RenderPassDescriptor,
},
renderer::RenderContext, renderer::RenderContext,
view::ViewDepthTexture, view::ViewDepthTexture,
}; };
@ -55,28 +51,11 @@ impl ViewNode for PrepassNode {
view_prepass_textures view_prepass_textures
.normal .normal
.as_ref() .as_ref()
.map(|view_normals_texture| RenderPassColorAttachment { .map(|normals_texture| normals_texture.get_attachment()),
view: &view_normals_texture.default_view,
resolve_target: None,
ops: Operations {
load: LoadOp::Clear(Color::BLACK.into()),
store: StoreOp::Store,
},
}),
view_prepass_textures view_prepass_textures
.motion_vectors .motion_vectors
.as_ref() .as_ref()
.map(|view_motion_vectors_texture| RenderPassColorAttachment { .map(|motion_vectors_texture| motion_vectors_texture.get_attachment()),
view: &view_motion_vectors_texture.default_view,
resolve_target: None,
ops: Operations {
// Red and Green channels are X and Y components of the motion vectors
// Blue channel doesn't matter, but set to 0.0 for possible faster clear
// https://gpuopen.com/performance/#clears
load: LoadOp::Clear(Color::BLACK.into()),
store: StoreOp::Store,
},
}),
// Use None in place of Deferred attachments // Use None in place of Deferred attachments
None, None,
None, None,
@ -92,14 +71,7 @@ impl ViewNode for PrepassNode {
let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor { let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("prepass"), label: Some("prepass"),
color_attachments: &color_attachments, color_attachments: &color_attachments,
depth_stencil_attachment: Some(RenderPassDepthStencilAttachment { depth_stencil_attachment: Some(view_depth_texture.get_attachment(StoreOp::Store)),
view: &view_depth_texture.view,
depth_ops: Some(Operations {
load: LoadOp::Clear(0.0),
store: StoreOp::Store,
}),
stencil_ops: None,
}),
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,
}); });
@ -128,7 +100,7 @@ impl ViewNode for PrepassNode {
// Copy depth buffer to texture // Copy depth buffer to texture
render_context.command_encoder().copy_texture_to_texture( render_context.command_encoder().copy_texture_to_texture(
view_depth_texture.texture.as_image_copy(), view_depth_texture.texture.as_image_copy(),
prepass_depth_texture.texture.as_image_copy(), prepass_depth_texture.texture.texture.as_image_copy(),
view_prepass_textures.size, view_prepass_textures.size,
); );
} }

4
crates/bevy_core_pipeline/src/taa/mod.rs
View file

@ -206,8 +206,8 @@ impl ViewNode for TemporalAntiAliasNode {
&BindGroupEntries::sequential(( &BindGroupEntries::sequential((
view_target.source, view_target.source,
&taa_history_textures.read.default_view, &taa_history_textures.read.default_view,
&prepass_motion_vectors_texture.default_view, &prepass_motion_vectors_texture.texture.default_view,
&prepass_depth_texture.default_view, &prepass_depth_texture.texture.default_view,
&pipelines.nearest_sampler, &pipelines.nearest_sampler,
&pipelines.linear_sampler, &pipelines.linear_sampler,
)), )),

15
crates/bevy_pbr/src/deferred/mod.rs
View file

@ -2,12 +2,10 @@ use crate::{MeshPipeline, MeshViewBindGroup, ScreenSpaceAmbientOcclusionSettings
use bevy_app::prelude::*; use bevy_app::prelude::*;
use bevy_asset::{load_internal_asset, Handle}; use bevy_asset::{load_internal_asset, Handle};
use bevy_core_pipeline::{ use bevy_core_pipeline::{
clear_color::ClearColorConfig,
core_3d, core_3d,
deferred::{ deferred::{
copy_lighting_id::DeferredLightingIdDepthTexture, DEFERRED_LIGHTING_PASS_ID_DEPTH_FORMAT, copy_lighting_id::DeferredLightingIdDepthTexture, DEFERRED_LIGHTING_PASS_ID_DEPTH_FORMAT,
}, },
prelude::{Camera3d, ClearColor},
prepass::{DeferredPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass}, prepass::{DeferredPrepass, DepthPrepass, MotionVectorPrepass, NormalPrepass},
tonemapping::{DebandDither, Tonemapping}, tonemapping::{DebandDither, Tonemapping},
}; };
@ -156,7 +154,6 @@ impl ViewNode for DeferredOpaquePass3dPbrLightingNode {
&'static MeshViewBindGroup, &'static MeshViewBindGroup,
&'static ViewTarget, &'static ViewTarget,
&'static DeferredLightingIdDepthTexture, &'static DeferredLightingIdDepthTexture,
&'static Camera3d,
&'static DeferredLightingPipeline, &'static DeferredLightingPipeline,
); );
@ -171,7 +168,6 @@ impl ViewNode for DeferredOpaquePass3dPbrLightingNode {
mesh_view_bind_group, mesh_view_bind_group,
target, target,
deferred_lighting_id_depth_texture, deferred_lighting_id_depth_texture,
camera_3d,
deferred_lighting_pipeline, deferred_lighting_pipeline,
): QueryItem<Self::ViewData>, ): QueryItem<Self::ViewData>,
world: &World, world: &World,
@ -201,16 +197,7 @@ impl ViewNode for DeferredOpaquePass3dPbrLightingNode {
let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor { let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("deferred_lighting_pass"), label: Some("deferred_lighting_pass"),
color_attachments: &[Some(target.get_color_attachment(Operations { color_attachments: &[Some(target.get_color_attachment())],
load: match camera_3d.clear_color {
ClearColorConfig::Default => {
LoadOp::Clear(world.resource::<ClearColor>().0.into())
}
ClearColorConfig::Custom(color) => LoadOp::Clear(color.into()),
ClearColorConfig::None => LoadOp::Load,
},
store: StoreOp::Store,
}))],
depth_stencil_attachment: Some(RenderPassDepthStencilAttachment { depth_stencil_attachment: Some(RenderPassDepthStencilAttachment {
view: &deferred_lighting_id_depth_texture.texture.default_view, view: &deferred_lighting_id_depth_texture.texture.default_view,
depth_ops: Some(Operations { depth_ops: Some(Operations {

21
crates/bevy_pbr/src/prepass/prepass_bindings.rs
View file

@ -64,19 +64,12 @@ pub fn get_bindings(prepass_textures: Option<&ViewPrepassTextures>) -> [Option<T
}; };
let depth_view = prepass_textures let depth_view = prepass_textures
.and_then(|x| x.depth.as_ref()) .and_then(|x| x.depth.as_ref())
.map(|texture| texture.texture.create_view(&depth_desc)); .map(|texture| texture.texture.texture.create_view(&depth_desc));
let normal_view = prepass_textures [
.and_then(|x| x.normal.as_ref()) depth_view,
.map(|texture| texture.default_view.clone()); prepass_textures.and_then(|pt| pt.normal_view().cloned()),
prepass_textures.and_then(|pt| pt.motion_vectors_view().cloned()),
let motion_vectors_view = prepass_textures prepass_textures.and_then(|pt| pt.deferred_view().cloned()),
.and_then(|x| x.motion_vectors.as_ref()) ]
.map(|texture| texture.default_view.clone());
let deferred_view = prepass_textures
.and_then(|x| x.deferred.as_ref())
.map(|texture| texture.default_view.clone());
[depth_view, normal_view, motion_vectors_view, deferred_view]
} }

19
crates/bevy_pbr/src/render/light.rs
View file

@ -521,7 +521,7 @@ fn face_index_to_name(face_index: usize) -> &'static str {
#[derive(Component)] #[derive(Component)]
pub struct ShadowView { pub struct ShadowView {
pub depth_texture_view: TextureView, pub depth_attachment: DepthAttachment,
pub pass_name: String, pub pass_name: String,
} }
@ -1008,7 +1008,7 @@ pub fn prepare_lights(
let view_light_entity = commands let view_light_entity = commands
.spawn(( .spawn((
ShadowView { ShadowView {
depth_texture_view, depth_attachment: DepthAttachment::new(depth_texture_view, Some(0.0)),
pass_name: format!( pass_name: format!(
"shadow pass point light {} {}", "shadow pass point light {} {}",
light_index, light_index,
@ -1070,7 +1070,7 @@ pub fn prepare_lights(
let view_light_entity = commands let view_light_entity = commands
.spawn(( .spawn((
ShadowView { ShadowView {
depth_texture_view, depth_attachment: DepthAttachment::new(depth_texture_view, Some(0.0)),
pass_name: format!("shadow pass spot light {light_index}"), pass_name: format!("shadow pass spot light {light_index}"),
}, },
ExtractedView { ExtractedView {
@ -1135,7 +1135,7 @@ pub fn prepare_lights(
let view_light_entity = commands let view_light_entity = commands
.spawn(( .spawn((
ShadowView { ShadowView {
depth_texture_view, depth_attachment: DepthAttachment::new(depth_texture_view, Some(0.0)),
pass_name: format!( pass_name: format!(
"shadow pass directional light {light_index} cascade {cascade_index}"), "shadow pass directional light {light_index} cascade {cascade_index}"),
}, },
@ -1767,14 +1767,9 @@ impl Node for ShadowPassNode {
render_context.begin_tracked_render_pass(RenderPassDescriptor { render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some(&view_light.pass_name), label: Some(&view_light.pass_name),
color_attachments: &[], color_attachments: &[],
depth_stencil_attachment: Some(RenderPassDepthStencilAttachment { depth_stencil_attachment: Some(
view: &view_light.depth_texture_view, view_light.depth_attachment.get_attachment(StoreOp::Store),
depth_ops: Some(Operations { ),
load: LoadOp::Clear(0.0),
store: StoreOp::Store,
}),
stencil_ops: None,
}),
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,
}); });

4
crates/bevy_pbr/src/ssao/mod.rs
View file

@ -681,7 +681,7 @@ fn prepare_ssao_bind_groups(
"ssao_preprocess_depth_bind_group", "ssao_preprocess_depth_bind_group",
&pipelines.preprocess_depth_bind_group_layout, &pipelines.preprocess_depth_bind_group_layout,
&BindGroupEntries::sequential(( &BindGroupEntries::sequential((
&prepass_textures.depth.as_ref().unwrap().default_view, prepass_textures.depth_view().unwrap(),
&create_depth_view(0), &create_depth_view(0),
&create_depth_view(1), &create_depth_view(1),
&create_depth_view(2), &create_depth_view(2),
@ -695,7 +695,7 @@ fn prepare_ssao_bind_groups(
&pipelines.gtao_bind_group_layout, &pipelines.gtao_bind_group_layout,
&BindGroupEntries::sequential(( &BindGroupEntries::sequential((
&ssao_textures.preprocessed_depth_texture.default_view, &ssao_textures.preprocessed_depth_texture.default_view,
&prepass_textures.normal.as_ref().unwrap().default_view, prepass_textures.normal_view().unwrap(),
&pipelines.hilbert_index_lut, &pipelines.hilbert_index_lut,
&ssao_textures.ssao_noisy_texture.default_view, &ssao_textures.ssao_noisy_texture.default_view,
&ssao_textures.depth_differences_texture.default_view, &ssao_textures.depth_differences_texture.default_view,

7
crates/bevy_render/src/camera/camera.rs
View file

@ -32,7 +32,7 @@ use bevy_window::{
use std::{borrow::Cow, ops::Range}; use std::{borrow::Cow, ops::Range};
use wgpu::{BlendState, LoadOp, TextureFormat}; use wgpu::{BlendState, LoadOp, TextureFormat};
use super::Projection; use super::{ClearColorConfig, Projection};
/// Render viewport configuration for the [`Camera`] component. /// Render viewport configuration for the [`Camera`] component.
/// ///
@ -118,6 +118,8 @@ pub struct Camera {
/// "write their results on top" of previous camera results, and include them as a part of their render results. This is enabled by default to ensure /// "write their results on top" of previous camera results, and include them as a part of their render results. This is enabled by default to ensure
/// cameras with MSAA enabled layer their results in the same way as cameras without MSAA enabled by default. /// cameras with MSAA enabled layer their results in the same way as cameras without MSAA enabled by default.
pub msaa_writeback: bool, pub msaa_writeback: bool,
/// The clear color operation to perform on the render target.
pub clear_color: ClearColorConfig,
} }
impl Default for Camera { impl Default for Camera {
@ -131,6 +133,7 @@ impl Default for Camera {
output_mode: Default::default(), output_mode: Default::default(),
hdr: false, hdr: false,
msaa_writeback: true, msaa_writeback: true,
clear_color: Default::default(),
} }
} }
} }
@ -632,6 +635,7 @@ pub struct ExtractedCamera {
pub order: isize, pub order: isize,
pub output_mode: CameraOutputMode, pub output_mode: CameraOutputMode,
pub msaa_writeback: bool, pub msaa_writeback: bool,
pub clear_color: ClearColorConfig,
pub sorted_camera_index_for_target: usize, pub sorted_camera_index_for_target: usize,
} }
@ -701,6 +705,7 @@ pub fn extract_cameras(
order: camera.order, order: camera.order,
output_mode: camera.output_mode, output_mode: camera.output_mode,
msaa_writeback: camera.msaa_writeback, msaa_writeback: camera.msaa_writeback,
clear_color: camera.clear_color.clone(),
// this will be set in sort_cameras // this will be set in sort_cameras
sorted_camera_index_for_target: 0, sorted_camera_index_for_target: 0,
}, },

2
crates/bevy_core_pipeline/src/clear_color.rs → crates/bevy_render/src/camera/clear_color.rs
View file

@ -1,7 +1,7 @@
use crate::{color::Color, extract_resource::ExtractResource};
use bevy_derive::{Deref, DerefMut}; use bevy_derive::{Deref, DerefMut};
use bevy_ecs::prelude::*; use bevy_ecs::prelude::*;
use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize}; use bevy_reflect::{Reflect, ReflectDeserialize, ReflectSerialize};
use bevy_render::{color::Color, extract_resource::ExtractResource};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
/// For a camera, specifies the color used to clear the viewport before rendering. /// For a camera, specifies the color used to clear the viewport before rendering.

6
crates/bevy_render/src/camera/mod.rs
View file

@ -1,11 +1,13 @@
#[allow(clippy::module_inception)] #[allow(clippy::module_inception)]
mod camera; mod camera;
mod camera_driver_node; mod camera_driver_node;
mod clear_color;
mod manual_texture_view; mod manual_texture_view;
mod projection; mod projection;
pub use camera::*; pub use camera::*;
pub use camera_driver_node::*; pub use camera_driver_node::*;
pub use clear_color::*;
pub use manual_texture_view::*; pub use manual_texture_view::*;
pub use projection::*; pub use projection::*;
@ -27,12 +29,16 @@ impl Plugin for CameraPlugin {
.register_type::<ScalingMode>() .register_type::<ScalingMode>()
.register_type::<CameraRenderGraph>() .register_type::<CameraRenderGraph>()
.register_type::<RenderTarget>() .register_type::<RenderTarget>()
.register_type::<ClearColor>()
.register_type::<ClearColorConfig>()
.init_resource::<ManualTextureViews>() .init_resource::<ManualTextureViews>()
.init_resource::<ClearColor>()
.add_plugins(( .add_plugins((
CameraProjectionPlugin::<Projection>::default(), CameraProjectionPlugin::<Projection>::default(),
CameraProjectionPlugin::<OrthographicProjection>::default(), CameraProjectionPlugin::<OrthographicProjection>::default(),
CameraProjectionPlugin::<PerspectiveProjection>::default(), CameraProjectionPlugin::<PerspectiveProjection>::default(),
ExtractResourcePlugin::<ManualTextureViews>::default(), ExtractResourcePlugin::<ManualTextureViews>::default(),
ExtractResourcePlugin::<ClearColor>::default(),
)); ));
if let Ok(render_app) = app.get_sub_app_mut(RenderApp) { if let Ok(render_app) = app.get_sub_app_mut(RenderApp) {

5
crates/bevy_render/src/lib.rs
View file

@ -27,7 +27,10 @@ pub mod view;
pub mod prelude { pub mod prelude {
#[doc(hidden)] #[doc(hidden)]
pub use crate::{ pub use crate::{
camera::{Camera, OrthographicProjection, PerspectiveProjection, Projection}, camera::{
Camera, ClearColor, ClearColorConfig, OrthographicProjection, PerspectiveProjection,
Projection,
},
color::Color, color::Color,
mesh::{morph::MorphWeights, shape, Mesh}, mesh::{morph::MorphWeights, shape, Mesh},
render_resource::Shader, render_resource::Shader,

2
crates/bevy_render/src/texture/mod.rs
View file

@ -14,6 +14,7 @@ mod image;
mod image_loader; mod image_loader;
#[cfg(feature = "ktx2")] #[cfg(feature = "ktx2")]
mod ktx2; mod ktx2;
mod texture_attachment;
mod texture_cache; mod texture_cache;
pub(crate) mod image_texture_conversion; pub(crate) mod image_texture_conversion;
@ -32,6 +33,7 @@ pub use hdr_texture_loader::*;
pub use compressed_image_saver::*; pub use compressed_image_saver::*;
pub use fallback_image::*; pub use fallback_image::*;
pub use image_loader::*; pub use image_loader::*;
pub use texture_attachment::*;
pub use texture_cache::*; pub use texture_cache::*;
use crate::{ use crate::{

123
crates/bevy_render/src/texture/texture_attachment.rs Normal file
View file

@ -0,0 +1,123 @@
use super::CachedTexture;
use crate::{prelude::Color, render_resource::TextureView};
use std::sync::{
atomic::{AtomicBool, Ordering},
Arc,
};
use wgpu::{
LoadOp, Operations, RenderPassColorAttachment, RenderPassDepthStencilAttachment, StoreOp,
};
/// A wrapper for a [`CachedTexture`] that is used as a [`RenderPassColorAttachment`].
#[derive(Clone)]
pub struct ColorAttachment {
pub texture: CachedTexture,
pub resolve_target: Option<CachedTexture>,
clear_color: Color,
is_first_call: Arc<AtomicBool>,
}
impl ColorAttachment {
pub fn new(
texture: CachedTexture,
resolve_target: Option<CachedTexture>,
clear_color: Color,
) -> Self {
Self {
texture,
resolve_target,
clear_color,
is_first_call: Arc::new(AtomicBool::new(true)),
}
}
/// Get this texture view as an attachment. The attachment will be cleared with a value of
/// `clear_color` if this is the first time calling this function, otherwise it will be loaded.
///
/// The returned attachment will always have writing enabled (`store: StoreOp::Load`).
pub fn get_attachment(&self) -> RenderPassColorAttachment {
if let Some(resolve_target) = self.resolve_target.as_ref() {
let first_call = self.is_first_call.fetch_and(false, Ordering::SeqCst);
RenderPassColorAttachment {
view: &resolve_target.default_view,
resolve_target: Some(&self.texture.default_view),
ops: Operations {
load: if first_call {
LoadOp::Clear(self.clear_color.into())
} else {
LoadOp::Load
},
store: StoreOp::Store,
},
}
} else {
self.get_unsampled_attachment()
}
}
/// Get this texture view as an attachment, without the resolve target. The attachment will be cleared with
/// a value of `clear_color` if this is the first time calling this function, otherwise it will be loaded.
///
/// The returned attachment will always have writing enabled (`store: StoreOp::Load`).
pub fn get_unsampled_attachment(&self) -> RenderPassColorAttachment {
let first_call = self.is_first_call.fetch_and(false, Ordering::SeqCst);
RenderPassColorAttachment {
view: &self.texture.default_view,
resolve_target: None,
ops: Operations {
load: if first_call {
LoadOp::Clear(self.clear_color.into())
} else {
LoadOp::Load
},
store: StoreOp::Store,
},
}
}
pub(crate) fn mark_as_cleared(&self) {
self.is_first_call.store(false, Ordering::SeqCst);
}
}
/// A wrapper for a [`TextureView`] that is used as a depth-only [`RenderPassDepthStencilAttachment`].
pub struct DepthAttachment {
pub view: TextureView,
clear_value: Option<f32>,
is_first_call: Arc<AtomicBool>,
}
impl DepthAttachment {
pub fn new(view: TextureView, clear_value: Option<f32>) -> Self {
Self {
view,
clear_value,
is_first_call: Arc::new(AtomicBool::new(clear_value.is_some())),
}
}
/// Get this texture view as an attachment. The attachment will be cleared with a value of
/// `clear_value` if this is the first time calling this function with `store` == [`StoreOp::Store`],
/// and a clear value was provided, otherwise it will be loaded.
pub fn get_attachment(&self, store: StoreOp) -> RenderPassDepthStencilAttachment {
let first_call = self
.is_first_call
.fetch_and(store != StoreOp::Store, Ordering::SeqCst);
RenderPassDepthStencilAttachment {
view: &self.view,
depth_ops: Some(Operations {
load: if first_call {
// If first_call is true, then a clear value will always have been provided in the constructor
LoadOp::Clear(self.clear_value.unwrap())
} else {
LoadOp::Load
},
store,
}),
stencil_ops: None,
}
}
}

125
crates/bevy_render/src/view/mod.rs
View file

@ -6,7 +6,9 @@ pub use visibility::*;
pub use window::*; pub use window::*;
use crate::{ use crate::{
camera::{ExtractedCamera, ManualTextureViews, MipBias, TemporalJitter}, camera::{
ClearColor, ClearColorConfig, ExtractedCamera, ManualTextureViews, MipBias, TemporalJitter,
},
extract_resource::{ExtractResource, ExtractResourcePlugin}, extract_resource::{ExtractResource, ExtractResourcePlugin},
prelude::{Image, Shader}, prelude::{Image, Shader},
primitives::Frustum, primitives::Frustum,
@ -14,7 +16,7 @@ use crate::{
render_phase::ViewRangefinder3d, render_phase::ViewRangefinder3d,
render_resource::{DynamicUniformBuffer, ShaderType, Texture, TextureView}, render_resource::{DynamicUniformBuffer, ShaderType, Texture, TextureView},
renderer::{RenderDevice, RenderQueue}, renderer::{RenderDevice, RenderQueue},
texture::{BevyDefault, CachedTexture, TextureCache}, texture::{BevyDefault, CachedTexture, ColorAttachment, DepthAttachment, TextureCache},
Render, RenderApp, RenderSet, Render, RenderApp, RenderSet,
}; };
use bevy_app::{App, Plugin}; use bevy_app::{App, Plugin};
@ -28,8 +30,8 @@ use std::sync::{
Arc, Arc,
}; };
use wgpu::{ use wgpu::{
Color, Extent3d, Operations, RenderPassColorAttachment, TextureDescriptor, TextureDimension, Extent3d, RenderPassColorAttachment, RenderPassDepthStencilAttachment, StoreOp,
TextureFormat, TextureUsages, TextureDescriptor, TextureDimension, TextureFormat, TextureUsages,
}; };
pub const VIEW_TYPE_HANDLE: Handle<Shader> = Handle::weak_from_u128(15421373904451797197); pub const VIEW_TYPE_HANDLE: Handle<Shader> = Handle::weak_from_u128(15421373904451797197);
@ -204,40 +206,30 @@ pub struct PostProcessWrite<'a> {
impl ViewTarget { impl ViewTarget {
pub const TEXTURE_FORMAT_HDR: TextureFormat = TextureFormat::Rgba16Float; pub const TEXTURE_FORMAT_HDR: TextureFormat = TextureFormat::Rgba16Float;
/// Retrieve this target's color attachment. This will use [`Self::sampled_main_texture_view`] and resolve to [`Self::main_texture`] if /// Retrieve this target's main texture's color attachment.
/// the target has sampling enabled. Otherwise it will use [`Self::main_texture`] directly. pub fn get_color_attachment(&self) -> RenderPassColorAttachment {
pub fn get_color_attachment(&self, ops: Operations<Color>) -> RenderPassColorAttachment { if self.main_texture.load(Ordering::SeqCst) == 0 {
match &self.main_textures.sampled { self.main_textures.a.get_attachment()
Some(CachedTexture { } else {
default_view: sampled_texture_view, self.main_textures.b.get_attachment()
..
}) => RenderPassColorAttachment {
view: sampled_texture_view,
resolve_target: Some(self.main_texture_view()),
ops,
},
None => self.get_unsampled_color_attachment(ops),
} }
} }
/// Retrieve an "unsampled" color attachment using [`Self::main_texture`]. /// Retrieve this target's "unsampled" main texture's color attachment.
pub fn get_unsampled_color_attachment( pub fn get_unsampled_color_attachment(&self) -> RenderPassColorAttachment {
&self, if self.main_texture.load(Ordering::SeqCst) == 0 {
ops: Operations<Color>, self.main_textures.a.get_unsampled_attachment()
) -> RenderPassColorAttachment { } else {
RenderPassColorAttachment { self.main_textures.b.get_unsampled_attachment()
view: self.main_texture_view(),
resolve_target: None,
ops,
} }
} }
/// The "main" unsampled texture. /// The "main" unsampled texture.
pub fn main_texture(&self) -> &Texture { pub fn main_texture(&self) -> &Texture {
if self.main_texture.load(Ordering::SeqCst) == 0 { if self.main_texture.load(Ordering::SeqCst) == 0 {
&self.main_textures.a.texture &self.main_textures.a.texture.texture
} else { } else {
&self.main_textures.b.texture &self.main_textures.b.texture.texture
} }
} }
@ -249,18 +241,18 @@ impl ViewTarget {
/// ahead of time. /// ahead of time.
pub fn main_texture_other(&self) -> &Texture { pub fn main_texture_other(&self) -> &Texture {
if self.main_texture.load(Ordering::SeqCst) == 0 { if self.main_texture.load(Ordering::SeqCst) == 0 {
&self.main_textures.b.texture &self.main_textures.b.texture.texture
} else { } else {
&self.main_textures.a.texture &self.main_textures.a.texture.texture
} }
} }
/// The "main" unsampled texture. /// The "main" unsampled texture.
pub fn main_texture_view(&self) -> &TextureView { pub fn main_texture_view(&self) -> &TextureView {
if self.main_texture.load(Ordering::SeqCst) == 0 { if self.main_texture.load(Ordering::SeqCst) == 0 {
&self.main_textures.a.default_view &self.main_textures.a.texture.default_view
} else { } else {
&self.main_textures.b.default_view &self.main_textures.b.texture.default_view
} }
} }
@ -272,16 +264,17 @@ impl ViewTarget {
/// ahead of time. /// ahead of time.
pub fn main_texture_other_view(&self) -> &TextureView { pub fn main_texture_other_view(&self) -> &TextureView {
if self.main_texture.load(Ordering::SeqCst) == 0 { if self.main_texture.load(Ordering::SeqCst) == 0 {
&self.main_textures.b.default_view &self.main_textures.b.texture.default_view
} else { } else {
&self.main_textures.a.default_view &self.main_textures.a.texture.default_view
} }
} }
/// The "main" sampled texture. /// The "main" sampled texture.
pub fn sampled_main_texture(&self) -> Option<&Texture> { pub fn sampled_main_texture(&self) -> Option<&Texture> {
self.main_textures self.main_textures
.sampled .a
.resolve_target
.as_ref() .as_ref()
.map(|sampled| &sampled.texture) .map(|sampled| &sampled.texture)
} }
@ -289,7 +282,8 @@ impl ViewTarget {
/// The "main" sampled texture view. /// The "main" sampled texture view.
pub fn sampled_main_texture_view(&self) -> Option<&TextureView> { pub fn sampled_main_texture_view(&self) -> Option<&TextureView> {
self.main_textures self.main_textures
.sampled .a
.resolve_target
.as_ref() .as_ref()
.map(|sampled| &sampled.default_view) .map(|sampled| &sampled.default_view)
} }
@ -328,14 +322,16 @@ impl ViewTarget {
let old_is_a_main_texture = self.main_texture.fetch_xor(1, Ordering::SeqCst); let old_is_a_main_texture = self.main_texture.fetch_xor(1, Ordering::SeqCst);
// if the old main texture is a, then the post processing must write from a to b // if the old main texture is a, then the post processing must write from a to b
if old_is_a_main_texture == 0 { if old_is_a_main_texture == 0 {
self.main_textures.b.mark_as_cleared();
PostProcessWrite { PostProcessWrite {
source: &self.main_textures.a.default_view, source: &self.main_textures.a.texture.default_view,
destination: &self.main_textures.b.default_view, destination: &self.main_textures.b.texture.default_view,
} }
} else { } else {
self.main_textures.a.mark_as_cleared();
PostProcessWrite { PostProcessWrite {
source: &self.main_textures.b.default_view, source: &self.main_textures.b.texture.default_view,
destination: &self.main_textures.a.default_view, destination: &self.main_textures.a.texture.default_view,
} }
} }
} }
@ -344,7 +340,24 @@ impl ViewTarget {
#[derive(Component)] #[derive(Component)]
pub struct ViewDepthTexture { pub struct ViewDepthTexture {
pub texture: Texture, pub texture: Texture,
pub view: TextureView, attachment: DepthAttachment,
}
impl ViewDepthTexture {
pub fn new(texture: CachedTexture, clear_value: Option<f32>) -> Self {
Self {
texture: texture.texture,
attachment: DepthAttachment::new(texture.default_view, clear_value),
}
}
pub fn get_attachment(&self, store: StoreOp) -> RenderPassDepthStencilAttachment {
self.attachment.get_attachment(store)
}
pub fn view(&self) -> &TextureView {
&self.attachment.view
}
} }
pub fn prepare_view_uniforms( pub fn prepare_view_uniforms(
@ -420,9 +433,8 @@ pub fn prepare_view_uniforms(
#[derive(Clone)] #[derive(Clone)]
struct MainTargetTextures { struct MainTargetTextures {
a: CachedTexture, a: ColorAttachment,
b: CachedTexture, b: ColorAttachment,
sampled: Option<CachedTexture>,
/// 0 represents `main_textures.a`, 1 represents `main_textures.b` /// 0 represents `main_textures.a`, 1 represents `main_textures.b`
/// This is shared across view targets with the same render target /// This is shared across view targets with the same render target
main_texture: Arc<AtomicUsize>, main_texture: Arc<AtomicUsize>,
@ -434,6 +446,7 @@ fn prepare_view_targets(
windows: Res<ExtractedWindows>, windows: Res<ExtractedWindows>,
images: Res<RenderAssets<Image>>, images: Res<RenderAssets<Image>>,
msaa: Res<Msaa>, msaa: Res<Msaa>,
clear_color_global: Res<ClearColor>,
render_device: Res<RenderDevice>, render_device: Res<RenderDevice>,
mut texture_cache: ResMut<TextureCache>, mut texture_cache: ResMut<TextureCache>,
cameras: Query<(Entity, &ExtractedCamera, &ExtractedView)>, cameras: Query<(Entity, &ExtractedCamera, &ExtractedView)>,
@ -458,7 +471,12 @@ fn prepare_view_targets(
TextureFormat::bevy_default() TextureFormat::bevy_default()
}; };
let main_textures = textures let clear_color = match camera.clear_color {
ClearColorConfig::Custom(color) => color,
_ => clear_color_global.0,
};
let (a, b, sampled) = textures
.entry((camera.target.clone(), view.hdr)) .entry((camera.target.clone(), view.hdr))
.or_insert_with(|| { .or_insert_with(|| {
let descriptor = TextureDescriptor { let descriptor = TextureDescriptor {
@ -509,18 +527,19 @@ fn prepare_view_targets(
} else { } else {
None None
}; };
MainTargetTextures { (a, b, sampled)
a,
b,
sampled,
main_texture: Arc::new(AtomicUsize::new(0)),
}
}); });
let main_textures = MainTargetTextures {
a: ColorAttachment::new(a.clone(), sampled.clone(), clear_color),
b: ColorAttachment::new(b.clone(), sampled.clone(), clear_color),
main_texture: Arc::new(AtomicUsize::new(0)),
};
commands.entity(entity).insert(ViewTarget { commands.entity(entity).insert(ViewTarget {
main_textures: main_textures.clone(),
main_texture_format,
main_texture: main_textures.main_texture.clone(), main_texture: main_textures.main_texture.clone(),
main_textures,
main_texture_format,
out_texture: out_texture_view.clone(), out_texture: out_texture_view.clone(),
out_texture_format: out_texture_format.add_srgb_suffix(), out_texture_format: out_texture_format.add_srgb_suffix(),
}); });

7
crates/bevy_ui/src/render/render_pass.rs
View file

@ -9,7 +9,7 @@ use bevy_ecs::{
use bevy_render::{ use bevy_render::{
render_graph::*, render_graph::*,
render_phase::*, render_phase::*,
render_resource::{CachedRenderPipelineId, LoadOp, Operations, RenderPassDescriptor, StoreOp}, render_resource::{CachedRenderPipelineId, RenderPassDescriptor},
renderer::*, renderer::*,
view::*, view::*,
}; };
@ -74,10 +74,7 @@ impl Node for UiPassNode {
}; };
let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor { let mut render_pass = render_context.begin_tracked_render_pass(RenderPassDescriptor {
label: Some("ui_pass"), label: Some("ui_pass"),
color_attachments: &[Some(target.get_unsampled_color_attachment(Operations { color_attachments: &[Some(target.get_unsampled_color_attachment())],
load: LoadOp::Load,
store: StoreOp::Store,
}))],
depth_stencil_attachment: None, depth_stencil_attachment: None,
timestamp_writes: None, timestamp_writes: None,
occlusion_query_set: None, occlusion_query_set: None,

5
examples/3d/render_to_texture.rs
View file

@ -100,14 +100,11 @@ fn setup(
commands.spawn(( commands.spawn((
Camera3dBundle { Camera3dBundle {
camera_3d: Camera3d {
clear_color: Color::WHITE.into(),
..default()
},
camera: Camera { camera: Camera {
// render before the "main pass" camera // render before the "main pass" camera
order: -1, order: -1,
target: RenderTarget::Image(image_handle.clone()), target: RenderTarget::Image(image_handle.clone()),
clear_color: Color::WHITE.into(),
..default() ..default()
}, },
transform: Transform::from_translation(Vec3::new(0.0, 0.0, 15.0)) transform: Transform::from_translation(Vec3::new(0.0, 0.0, 15.0))

8
examples/3d/split_screen.rs
View file

@ -3,8 +3,7 @@
use std::f32::consts::PI; use std::f32::consts::PI;
use bevy::{ use bevy::{
core_pipeline::clear_color::ClearColorConfig, pbr::CascadeShadowConfigBuilder, prelude::*, pbr::CascadeShadowConfigBuilder, prelude::*, render::camera::Viewport, window::WindowResized,
render::camera::Viewport, window::WindowResized,
}; };
fn main() { fn main() {
@ -67,10 +66,7 @@ fn setup(
camera: Camera { camera: Camera {
// Renders the right camera after the left camera, which has a default priority of 0 // Renders the right camera after the left camera, which has a default priority of 0
order: 1, order: 1,
..default() // Don't clear on the second camera because the first camera already cleared the window
},
camera_3d: Camera3d {
// don't clear on the second camera because the first camera already cleared the window
clear_color: ClearColorConfig::None, clear_color: ClearColorConfig::None,
..default() ..default()
}, },

7
examples/3d/two_passes.rs
View file

@ -1,6 +1,6 @@
//! Renders two 3d passes to the same window from different perspectives. //! Renders two 3d passes to the same window from different perspectives.
use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*}; use bevy::prelude::*;
fn main() { fn main() {
App::new() App::new()
@ -47,13 +47,10 @@ fn setup(
// camera // camera
commands.spawn(Camera3dBundle { commands.spawn(Camera3dBundle {
transform: Transform::from_xyz(10.0, 10., -5.0).looking_at(Vec3::ZERO, Vec3::Y), transform: Transform::from_xyz(10.0, 10., -5.0).looking_at(Vec3::ZERO, Vec3::Y),
camera_3d: Camera3d {
clear_color: ClearColorConfig::None,
..default()
},
camera: Camera { camera: Camera {
// renders after / on top of the main camera // renders after / on top of the main camera
order: 1, order: 1,
clear_color: ClearColorConfig::None,
..default() ..default()
}, },
..default() ..default()

2
examples/shader/post_processing.rs
View file

@ -305,7 +305,7 @@ fn setup(
Camera3dBundle { Camera3dBundle {
transform: Transform::from_translation(Vec3::new(0.0, 0.0, 5.0)) transform: Transform::from_translation(Vec3::new(0.0, 0.0, 5.0))
.looking_at(Vec3::default(), Vec3::Y), .looking_at(Vec3::default(), Vec3::Y),
camera_3d: Camera3d { camera: Camera {
clear_color: Color::WHITE.into(), clear_color: Color::WHITE.into(),
..default() ..default()
}, },

6
tests/window/minimising.rs
View file

@ -1,6 +1,6 @@
//! A test to confirm that `bevy` allows minimising the window //! A test to confirm that `bevy` allows minimising the window
//! This is run in CI to ensure that this doesn't regress again. //! This is run in CI to ensure that this doesn't regress again.
use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*}; use bevy::prelude::*;
fn main() { fn main() {
// TODO: Combine this with `resizing` once multiple_windows is simpler than // TODO: Combine this with `resizing` once multiple_windows is simpler than
@ -72,11 +72,9 @@ fn setup_2d(mut commands: Commands) {
camera: Camera { camera: Camera {
// render the 2d camera after the 3d camera // render the 2d camera after the 3d camera
order: 1, order: 1,
..default()
},
camera_2d: Camera2d {
// do not use a clear color // do not use a clear color
clear_color: ClearColorConfig::None, clear_color: ClearColorConfig::None,
..default()
}, },
..default() ..default()
}); });

6
tests/window/resizing.rs
View file

@ -1,7 +1,7 @@
//! A test to confirm that `bevy` allows setting the window to arbitrary small sizes //! A test to confirm that `bevy` allows setting the window to arbitrary small sizes
//! This is run in CI to ensure that this doesn't regress again. //! This is run in CI to ensure that this doesn't regress again.
use bevy::{core_pipeline::clear_color::ClearColorConfig, prelude::*, window::WindowResolution}; use bevy::{prelude::*, window::WindowResolution};
// The smallest size reached is 1x1, as X11 doesn't support windows with a 0 dimension // The smallest size reached is 1x1, as X11 doesn't support windows with a 0 dimension
// TODO: Add a check for platforms other than X11 for 0xk and kx0, despite those currently unsupported on CI. // TODO: Add a check for platforms other than X11 for 0xk and kx0, despite those currently unsupported on CI.
@ -155,11 +155,9 @@ fn setup_2d(mut commands: Commands) {
camera: Camera { camera: Camera {
// render the 2d camera after the 3d camera // render the 2d camera after the 3d camera
order: 1, order: 1,
..default()
},
camera_2d: Camera2d {
// do not use a clear color // do not use a clear color
clear_color: ClearColorConfig::None, clear_color: ClearColorConfig::None,
..default()
}, },
..default() ..default()
}); });