43e8a156fb
Upgrades both the old and new renderer to wgpu 0.11 (and naga 0.7). This builds on @zicklag's work here #2556. Co-authored-by: Carter Anderson <mcanders1@gmail.com>
82 lines
2.5 KiB
Rust
82 lines
2.5 KiB
Rust
mod graph_runner;
|
|
mod render_device;
|
|
|
|
use bevy_utils::tracing::{info, info_span};
|
|
pub use graph_runner::*;
|
|
pub use render_device::*;
|
|
|
|
use crate::{render_graph::RenderGraph, view::ExtractedWindows};
|
|
use bevy_ecs::prelude::*;
|
|
use std::sync::Arc;
|
|
use wgpu::{Backends, CommandEncoder, DeviceDescriptor, Instance, Queue, RequestAdapterOptions};
|
|
|
|
pub fn render_system(world: &mut World) {
|
|
world.resource_scope(|world, mut graph: Mut<RenderGraph>| {
|
|
graph.update(world);
|
|
});
|
|
let graph = world.get_resource::<RenderGraph>().unwrap();
|
|
let render_device = world.get_resource::<RenderDevice>().unwrap();
|
|
let render_queue = world.get_resource::<RenderQueue>().unwrap();
|
|
RenderGraphRunner::run(
|
|
graph,
|
|
render_device.clone(), // TODO: is this clone really necessary?
|
|
render_queue,
|
|
world,
|
|
)
|
|
.unwrap();
|
|
{
|
|
let span = info_span!("present_frames");
|
|
let _guard = span.enter();
|
|
let mut windows = world.get_resource_mut::<ExtractedWindows>().unwrap();
|
|
for window in windows.values_mut() {
|
|
if let Some(texture_view) = window.swap_chain_texture.take() {
|
|
if let Some(surface_texture) = texture_view.take_surface_texture() {
|
|
surface_texture.present();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
pub type RenderQueue = Arc<Queue>;
|
|
pub type RenderInstance = Instance;
|
|
|
|
pub async fn initialize_renderer(
|
|
backends: Backends,
|
|
request_adapter_options: &RequestAdapterOptions<'_>,
|
|
device_descriptor: &DeviceDescriptor<'_>,
|
|
) -> (RenderInstance, RenderDevice, RenderQueue) {
|
|
let instance = wgpu::Instance::new(backends);
|
|
|
|
let adapter = instance
|
|
.request_adapter(request_adapter_options)
|
|
.await
|
|
.expect("Unable to find a GPU! Make sure you have installed required drivers!");
|
|
|
|
#[cfg(not(target_arch = "wasm32"))]
|
|
info!("{:?}", adapter.get_info());
|
|
|
|
#[cfg(feature = "trace")]
|
|
let trace_path = {
|
|
let path = std::path::Path::new("wgpu_trace");
|
|
// ignore potential error, wgpu will log it
|
|
let _ = std::fs::create_dir(path);
|
|
Some(path)
|
|
};
|
|
#[cfg(not(feature = "trace"))]
|
|
let trace_path = None;
|
|
|
|
let (device, queue) = adapter
|
|
.request_device(device_descriptor, trace_path)
|
|
.await
|
|
.unwrap();
|
|
let device = Arc::new(device);
|
|
let queue = Arc::new(queue);
|
|
(instance, RenderDevice::from(device), queue)
|
|
}
|
|
|
|
pub struct RenderContext {
|
|
pub render_device: RenderDevice,
|
|
pub command_encoder: CommandEncoder,
|
|
}
|