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

mini blit refactor

Browse Source
This commit is contained in:
Emerson Coskey 2025-07-13 13:50:39 -07:00
parent c9c8964857
commit 60c7b7cefc
No known key found for this signature in database
3 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
crates/bevy_core_pipeline/src/blit/mod.rs
View File

@ -36,7 +36,7 @@ impl Plugin for BlitPlugin {
#[derive(Resource)] #[derive(Resource)]
pub struct BlitPipeline { pub struct BlitPipeline {
pub texture_bind_group: BindGroupLayout, pub layout: BindGroupLayout,
pub sampler: Sampler, pub sampler: Sampler,
pub fullscreen_shader: FullscreenShader, pub fullscreen_shader: FullscreenShader,
pub fragment_shader: Handle<Shader>, pub fragment_shader: Handle<Shader>,
@ -46,7 +46,7 @@ impl FromWorld for BlitPipeline {
fn from_world(render_world: &mut World) -> Self { fn from_world(render_world: &mut World) -> Self {
let render_device = render_world.resource::<RenderDevice>(); let render_device = render_world.resource::<RenderDevice>();
let texture_bind_group = render_device.create_bind_group_layout( let layout = render_device.create_bind_group_layout(
"blit_bind_group_layout", "blit_bind_group_layout",
&BindGroupLayoutEntries::sequential( &BindGroupLayoutEntries::sequential(
ShaderStages::FRAGMENT, ShaderStages::FRAGMENT,
@ -60,7 +60,7 @@ impl FromWorld for BlitPipeline {
let sampler = render_device.create_sampler(&SamplerDescriptor::default()); let sampler = render_device.create_sampler(&SamplerDescriptor::default());
BlitPipeline { BlitPipeline {
texture_bind_group, layout,
sampler, sampler,
fullscreen_shader: render_world.resource::<FullscreenShader>().clone(), fullscreen_shader: render_world.resource::<FullscreenShader>().clone(),
fragment_shader: load_embedded_asset!(render_world, "blit.wgsl"), fragment_shader: load_embedded_asset!(render_world, "blit.wgsl"),
@ -68,6 +68,20 @@ impl FromWorld for BlitPipeline {
} }
} }
impl BlitPipeline {
pub fn create_bind_group(
&self,
render_device: &RenderDevice,
src_texture: &TextureView,
) -> BindGroup {
render_device.create_bind_group(
None,
&self.layout,
&BindGroupEntries::sequential((src_texture, &self.sampler)),
)
}
}
#[derive(PartialEq, Eq, Hash, Clone, Copy)] #[derive(PartialEq, Eq, Hash, Clone, Copy)]
pub struct BlitPipelineKey { pub struct BlitPipelineKey {
pub texture_format: TextureFormat, pub texture_format: TextureFormat,
@ -81,7 +95,7 @@ impl SpecializedRenderPipeline for BlitPipeline {
fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor { fn specialize(&self, key: Self::Key) -> RenderPipelineDescriptor {
RenderPipelineDescriptor { RenderPipelineDescriptor {
label: Some("blit pipeline".into()), label: Some("blit pipeline".into()),
layout: vec![self.texture_bind_group.clone()], layout: vec![self.layout.clone()],
vertex: self.fullscreen_shader.to_vertex_state(), vertex: self.fullscreen_shader.to_vertex_state(),
fragment: Some(FragmentState { fragment: Some(FragmentState {
shader: self.fragment_shader.clone(), shader: self.fragment_shader.clone(),

7
crates/bevy_core_pipeline/src/msaa_writeback.rs
View File

@ -98,11 +98,8 @@ impl ViewNode for MsaaWritebackNode {
occlusion_query_set: None, occlusion_query_set: None,
}; };
let bind_group = render_context.render_device().create_bind_group( let bind_group =
None, blit_pipeline.create_bind_group(render_context.render_device(), post_process.source);
&blit_pipeline.texture_bind_group,
&BindGroupEntries::sequential((post_process.source, &blit_pipeline.sampler)),
);
let mut render_pass = render_context let mut render_pass = render_context
.command_encoder() .command_encoder()

21
crates/bevy_core_pipeline/src/upscaling/node.rs
View File

@ -30,9 +30,9 @@ impl ViewNode for UpscalingNode {
(target, upscaling_target, camera): QueryItem<Self::ViewQuery>, (target, upscaling_target, camera): QueryItem<Self::ViewQuery>,
world: &World, world: &World,
) -> Result<(), NodeRunError> { ) -> Result<(), NodeRunError> {
let pipeline_cache = world.get_resource::<PipelineCache>().unwrap(); let pipeline_cache = world.resource::<PipelineCache>();
let blit_pipeline = world.get_resource::<BlitPipeline>().unwrap(); let blit_pipeline = world.resource::<BlitPipeline>();
let clear_color_global = world.get_resource::<ClearColor>().unwrap(); let clear_color_global = world.resource::<ClearColor>();
let clear_color = if let Some(camera) = camera { let clear_color = if let Some(camera) = camera {
match camera.output_mode { match camera.output_mode {
@ -48,19 +48,18 @@ impl ViewNode for UpscalingNode {
ClearColorConfig::None => None, ClearColorConfig::None => None,
}; };
let converted_clear_color = clear_color.map(Into::into); let converted_clear_color = clear_color.map(Into::into);
let upscaled_texture = target.main_texture_view(); // texture to be upscaled to the output texture
let main_texture_view = target.main_texture_view();
let mut cached_bind_group = self.cached_texture_bind_group.lock().unwrap(); let mut cached_bind_group = self.cached_texture_bind_group.lock().unwrap();
let bind_group = match &mut *cached_bind_group { let bind_group = match &mut *cached_bind_group {
Some((id, bind_group)) if upscaled_texture.id() == *id => bind_group, Some((id, bind_group)) if main_texture_view.id() == *id => bind_group,
cached_bind_group => { cached_bind_group => {
let bind_group = render_context.render_device().create_bind_group( let bind_group = blit_pipeline
None, .create_bind_group(render_context.render_device(), main_texture_view);
&blit_pipeline.texture_bind_group,
&BindGroupEntries::sequential((upscaled_texture, &blit_pipeline.sampler)),
);
let (_, bind_group) = cached_bind_group.insert((upscaled_texture.id(), bind_group)); let (_, bind_group) =
cached_bind_group.insert((main_texture_view.id(), bind_group));
bind_group bind_group
} }
}; };