Replace RenderGraph with systems
#22144
+6,435
−10,584
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,126 +1,97 @@ | ||
| use crate::contrast_adaptive_sharpening::ViewCasPipeline; | ||
| use bevy_ecs::prelude::*; | ||
| use bevy_render::{ | ||
| diagnostic::RecordDiagnostics, | ||
| extract_component::{ComponentUniforms, DynamicUniformIndex}, | ||
| render_resource::{ | ||
| BindGroup, BindGroupEntries, BufferId, Operations, PipelineCache, | ||
| RenderPassColorAttachment, RenderPassDescriptor, TextureViewId, | ||
| }, | ||
| renderer::{RenderContext, ViewQuery}, | ||
| view::{ExtractedView, ViewTarget}, | ||
| }; | ||
|
|
||
| use super::{CasPipeline, CasUniform}; | ||
|
|
||
| pub(crate) fn cas( | ||
| view: ViewQuery< | ||
| ( | ||
| &ViewTarget, | ||
| &ViewCasPipeline, | ||
| &DynamicUniformIndex<CasUniform>, | ||
| ), | ||
| With<ExtractedView>, | ||
| >, | ||
| sharpening_pipeline: Res<CasPipeline>, | ||
| pipeline_cache: Res<PipelineCache>, | ||
| uniforms: Res<ComponentUniforms<CasUniform>>, | ||
| mut ctx: RenderContext, | ||
| mut cached_bind_group: Local<Option<(BufferId, TextureViewId, BindGroup)>>, | ||
| ) { | ||
| let (target, pipeline, uniform_index) = view.into_inner(); | ||
|
|
||
| let uniforms_id = uniforms.buffer().unwrap().id(); | ||
| let Some(uniforms_binding) = uniforms.binding() else { | ||
| return; | ||
| }; | ||
|
|
||
| let Some(pipeline) = pipeline_cache.get_render_pipeline(pipeline.0) else { | ||
| return; | ||
| }; | ||
|
|
||
| let view_target = target.post_process_write(); | ||
| let source = view_target.source; | ||
| let destination = view_target.destination; | ||
|
|
||
| let bind_group = match &mut *cached_bind_group { | ||
| Some((buffer_id, texture_id, bind_group)) | ||
| if source.id() == *texture_id && uniforms_id == *buffer_id => | ||
| { | ||
| bind_group | ||
| } | ||
| cached => { | ||
| let bind_group = ctx.render_device().create_bind_group( | ||
| "cas_bind_group", | ||
| &pipeline_cache.get_bind_group_layout(&sharpening_pipeline.layout), | ||
| &BindGroupEntries::sequential(( | ||
| view_target.source, | ||
| &sharpening_pipeline.sampler, | ||
| uniforms_binding, | ||
| )), | ||
| ); | ||
|
|
||
| let (_, _, bind_group) = cached.insert((uniforms_id, source.id(), bind_group)); | ||
| bind_group | ||
| } | ||
| }; | ||
|
|
||
| let pass_descriptor = RenderPassDescriptor { | ||
| label: Some("contrast_adaptive_sharpening"), | ||
| color_attachments: &[Some(RenderPassColorAttachment { | ||
| view: destination, | ||
| depth_slice: None, | ||
| resolve_target: None, | ||
| ops: Operations::default(), | ||
| })], | ||
| depth_stencil_attachment: None, | ||
| timestamp_writes: None, | ||
| occlusion_query_set: None, | ||
| }; | ||
|
|
||
| let diagnostics = ctx.diagnostic_recorder(); | ||
| let diagnostics = diagnostics.as_deref(); | ||
| let time_span = diagnostics.time_span(ctx.command_encoder(), "contrast_adaptive_sharpening"); | ||
|
|
||
| { | ||
| let mut render_pass = ctx.command_encoder().begin_render_pass(&pass_descriptor); | ||
| let pass_span = diagnostics.pass_span(&mut render_pass, "contrast_adaptive_sharpening"); | ||
|
|
||
| render_pass.set_pipeline(pipeline); | ||
| render_pass.set_bind_group(0, bind_group, &[uniform_index.index()]); | ||
| render_pass.draw(0..3, 0..1); | ||
|
|
||
| pass_span.end(&mut render_pass); | ||
| } | ||
|
|
||
| time_span.end(ctx.command_encoder()); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this makes clean compile a bit worse cus linearizes compilation of these two crates, but its probably fine. could use system sets to avoid it though