From a3c1b7930e8a880869a345ed3287f7dcb6cf0f13 Mon Sep 17 00:00:00 2001
From: Carter Anderson <mcanders1@gmail.com>
Date: Fri, 19 Jun 2020 13:44:21 -0700
Subject: [PATCH] render: fix SharedBuffers render resource context

---
 .../src/render_graph/nodes/shared_buffers_node.rs   | 13 ++++++-------
 crates/bevy_wgpu/src/lib.rs                         |  9 +++------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/crates/bevy_render/src/render_graph/nodes/shared_buffers_node.rs b/crates/bevy_render/src/render_graph/nodes/shared_buffers_node.rs
index 71c92087d5..8e065f4243 100644
--- a/crates/bevy_render/src/render_graph/nodes/shared_buffers_node.rs
+++ b/crates/bevy_render/src/render_graph/nodes/shared_buffers_node.rs
@@ -1,6 +1,6 @@
 use crate::{
     render_graph::{Node, ResourceSlots},
-    renderer::RenderContext,
+    renderer::RenderContext, render_resource::SharedBuffers,
 };
 use legion::prelude::*;
 
@@ -11,14 +11,13 @@ impl Node for SharedBuffersNode {
     fn update(
         &mut self,
         _world: &World,
-        _resources: &Resources,
-        _render_context: &mut dyn RenderContext,
+        resources: &Resources,
+        render_context: &mut dyn RenderContext,
         _input: &ResourceSlots,
         _output: &mut ResourceSlots,
     ) {
-        // TODO: enable me 
-        // let shared_buffers = resources.get::<SharedBuffers>().unwrap();
-        // let mut command_queue = shared_buffers.reset_command_queue();
-        // command_queue.execute(render_context);
+        let shared_buffers = resources.get::<SharedBuffers>().unwrap();
+        let mut command_queue = shared_buffers.reset_command_queue();
+        command_queue.execute(render_context);
     }
 }
diff --git a/crates/bevy_wgpu/src/lib.rs b/crates/bevy_wgpu/src/lib.rs
index dba771b60b..8a2f0eb4ba 100644
--- a/crates/bevy_wgpu/src/lib.rs
+++ b/crates/bevy_wgpu/src/lib.rs
@@ -33,12 +33,9 @@ impl AppPlugin for WgpuPlugin {
 
 pub fn wgpu_render_system(resources: &mut Resources) -> impl FnMut(&mut World, &mut Resources) {
     let mut wgpu_renderer = pollster::block_on(WgpuRenderer::new());
-    resources.insert::<Box<dyn RenderResourceContext>>(Box::new(WgpuRenderResourceContext::new(
-        wgpu_renderer.device.clone(),
-    )));
-    resources.insert(SharedBuffers::new(Box::new(
-        WgpuRenderResourceContext::new(wgpu_renderer.device.clone()),
-    )));
+    let resource_context = WgpuRenderResourceContext::new(wgpu_renderer.device.clone());
+    resources.insert::<Box<dyn RenderResourceContext>>(Box::new(resource_context.clone()));
+    resources.insert(SharedBuffers::new(Box::new(resource_context)));
     move |world, resources| {
         wgpu_renderer.update(world, resources);
     }