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

fix render graph lifetimes

Browse Source
This commit is contained in:
Carter Anderson 2020-03-22 13:05:50 -07:00
parent a0fa4d2d79
commit 0e18c4b70b
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/render/render_graph/render_graph_builder.rs
View File

@ -29,12 +29,12 @@ impl<'a> RenderGraphBuilder<'a> {
}
pub fn add_pipeline(&mut self, name: &str, build: impl Fn(&mut PipelineBuilder)) -> &mut Self {
let mut pipeline_descriptor_storage = self
.resources
.get_mut::<AssetStorage<PipelineDescriptor>>()
.unwrap();
let mut shader_storage = self.resources.get_mut::<AssetStorage<Shader>>().unwrap();
if let Some(ref pass) = self.current_pass {
let mut pipeline_descriptor_storage = self
.resources
.get_mut::<AssetStorage<PipelineDescriptor>>()
.unwrap();
let mut shader_storage = self.resources.get_mut::<AssetStorage<Shader>>().unwrap();
let mut builder = PipelineBuilder::new(name, &mut shader_storage);
build(&mut builder);
let pipeline = builder.finish();
@ -55,20 +55,22 @@ impl<'a> RenderGraphBuilder<'a> {
name: &str,
build: impl Fn(&mut PipelineBuilder),
) -> &mut Self {
let mut pipeline_descriptor_storage = self
.resources
.get_mut::<AssetStorage<PipelineDescriptor>>()
.unwrap();
let mut shader_storage = self.resources.get_mut::<AssetStorage<Shader>>().unwrap();
let mut builder = PipelineBuilder::new(name, &mut shader_storage);
build(&mut builder);
let pipeline = builder.finish();
let pipeline_descriptor_handle = pipeline_descriptor_storage.add(pipeline);
pipeline_descriptor_storage.set_name(name, pipeline_descriptor_handle);
self.render_graph
.as_mut()
.unwrap()
.add_pipeline(pass, pipeline_descriptor_handle);
{
let mut pipeline_descriptor_storage = self
.resources
.get_mut::<AssetStorage<PipelineDescriptor>>()
.unwrap();
let mut shader_storage = self.resources.get_mut::<AssetStorage<Shader>>().unwrap();
let mut builder = PipelineBuilder::new(name, &mut shader_storage);
build(&mut builder);
let pipeline = builder.finish();
let pipeline_descriptor_handle = pipeline_descriptor_storage.add(pipeline);
pipeline_descriptor_storage.set_name(name, pipeline_descriptor_handle);
self.render_graph
.as_mut()
.unwrap()
.add_pipeline(pass, pipeline_descriptor_handle);
}
self
}