Allowing wgpu renderer to be created separately

bevyengine · Oct 9, 2021 · 7df77dc · 7df77dc
1 parent 43e8a15
commit 7df77dc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 16 deletions.
diff --git a/pipelined/bevy_render2/src/lib.rs b/pipelined/bevy_render2/src/lib.rs
@@ -84,17 +84,21 @@ struct ScratchRenderWorld(World);
 
 impl Plugin for RenderPlugin {
     fn build(&self, app: &mut App) {
-        let (instance, device, queue) =
-            futures_lite::future::block_on(renderer::initialize_renderer(
-                wgpu::util::backend_bits_from_env().unwrap_or(Backends::PRIMARY),
-                &wgpu::RequestAdapterOptions {
-                    power_preference: wgpu::PowerPreference::HighPerformance,
-                    ..Default::default()
-                },
-                &wgpu::DeviceDescriptor::default(),
-            ));
-        app.insert_resource(device.clone())
-            .insert_resource(queue.clone())
+        let renderer = app
+            .world
+            .remove_resource::<renderer::Renderer>()
+            .unwrap_or_else(|| {
+                futures_lite::future::block_on(renderer::initialize_renderer(
+                    wgpu::util::backend_bits_from_env().unwrap_or(Backends::PRIMARY),
+                    &wgpu::RequestAdapterOptions {
+                        power_preference: wgpu::PowerPreference::HighPerformance,
+                        ..Default::default()
+                    },
+                    &wgpu::DeviceDescriptor::default(),
+                ))
+            });
+        app.insert_resource(renderer.device.clone())
+            .insert_resource(renderer.queue.clone())
             .init_resource::<ScratchRenderWorld>();
         let asset_server = app.world.get_resource::<AssetServer>().unwrap().clone();
 
@@ -113,9 +117,9 @@ impl Plugin for RenderPlugin {
                 SystemStage::parallel().with_system(render_system.exclusive_system()),
             )
             .add_stage(RenderStage::Cleanup, SystemStage::parallel())
-            .insert_resource(instance)
-            .insert_resource(device)
-            .insert_resource(queue)
+            .insert_resource(renderer.instance)
+            .insert_resource(renderer.device)
+            .insert_resource(renderer.queue)
             .insert_resource(asset_server)
             .init_resource::<RenderGraph>();
 

diff --git a/pipelined/bevy_render2/src/renderer/mod.rs b/pipelined/bevy_render2/src/renderer/mod.rs
@@ -41,11 +41,17 @@ pub fn render_system(world: &mut World) {
 pub type RenderQueue = Arc<Queue>;
 pub type RenderInstance = Instance;
 
+pub struct Renderer {
+    pub instance: RenderInstance,
+    pub device: RenderDevice,
+    pub queue: RenderQueue,
+}
+
 pub async fn initialize_renderer(
     backends: Backends,
     request_adapter_options: &RequestAdapterOptions<'_>,
     device_descriptor: &DeviceDescriptor<'_>,
-) -> (RenderInstance, RenderDevice, RenderQueue) {
+) -> Renderer {
     let instance = wgpu::Instance::new(backends);
 
     let adapter = instance
@@ -72,7 +78,11 @@ pub async fn initialize_renderer(
         .unwrap();
     let device = Arc::new(device);
     let queue = Arc::new(queue);
-    (instance, RenderDevice::from(device), queue)
+    Renderer {
+        instance,
+        device: RenderDevice::from(device),
+        queue,
+    }
 }
 
 pub struct RenderContext {