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

render: fix SharedBuffers render resource context

Browse Source
This commit is contained in:
Carter Anderson 2020-06-19 13:44:21 -07:00
parent 4246d47fec
commit a3c1b7930e
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crates/bevy_render/src/render_graph/nodes/shared_buffers_node.rs
View File

@ -1,6 +1,6 @@
use crate::{ use crate::{
render_graph::{Node, ResourceSlots}, render_graph::{Node, ResourceSlots},
renderer::RenderContext, renderer::RenderContext, render_resource::SharedBuffers,
}; };
use legion::prelude::*; use legion::prelude::*;
@ -11,14 +11,13 @@ impl Node for SharedBuffersNode {
fn update( fn update(
&mut self, &mut self,
_world: &World, _world: &World,
_resources: &Resources, resources: &Resources,
_render_context: &mut dyn RenderContext, render_context: &mut dyn RenderContext,
_input: &ResourceSlots, _input: &ResourceSlots,
_output: &mut ResourceSlots, _output: &mut ResourceSlots,
) { ) {
// TODO: enable me let shared_buffers = resources.get::<SharedBuffers>().unwrap();
// let shared_buffers = resources.get::<SharedBuffers>().unwrap(); let mut command_queue = shared_buffers.reset_command_queue();
// let mut command_queue = shared_buffers.reset_command_queue(); command_queue.execute(render_context);
// command_queue.execute(render_context);
} }
} }

9
crates/bevy_wgpu/src/lib.rs
View File

@ -33,12 +33,9 @@ impl AppPlugin for WgpuPlugin {
pub fn wgpu_render_system(resources: &mut Resources) -> impl FnMut(&mut World, &mut Resources) { pub fn wgpu_render_system(resources: &mut Resources) -> impl FnMut(&mut World, &mut Resources) {
let mut wgpu_renderer = pollster::block_on(WgpuRenderer::new()); let mut wgpu_renderer = pollster::block_on(WgpuRenderer::new());
resources.insert::<Box<dyn RenderResourceContext>>(Box::new(WgpuRenderResourceContext::new( let resource_context = WgpuRenderResourceContext::new(wgpu_renderer.device.clone());
wgpu_renderer.device.clone(), resources.insert::<Box<dyn RenderResourceContext>>(Box::new(resource_context.clone()));
))); resources.insert(SharedBuffers::new(Box::new(resource_context)));
resources.insert(SharedBuffers::new(Box::new(
WgpuRenderResourceContext::new(wgpu_renderer.device.clone()),
)));
move |world, resources| { move |world, resources| {
wgpu_renderer.update(world, resources); wgpu_renderer.update(world, resources);
} }