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

Fix compilation error (#17060)

Browse Source 
Small follow-up to #17011 

Please don't merge until the CI passes all checks
This commit is contained in:
Benjamin Brienen 2024-12-31 11:22:19 -05:00 committed by GitHub
parent 63634fd408
commit c93217b966
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crates/bevy_render/src/renderer/graph_runner.rs
View File

@ -68,6 +68,7 @@ impl RenderGraphRunner {
render_device: RenderDevice, render_device: RenderDevice,
mut diagnostics_recorder: Option<DiagnosticsRecorder>, mut diagnostics_recorder: Option<DiagnosticsRecorder>,
queue: &wgpu::Queue, queue: &wgpu::Queue,
#[cfg(not(all(target_arch = "wasm32", target_feature = "atomics")))]
adapter: &wgpu::Adapter, adapter: &wgpu::Adapter,
world: &World, world: &World,
finalizer: impl FnOnce(&mut wgpu::CommandEncoder), finalizer: impl FnOnce(&mut wgpu::CommandEncoder),
@ -76,8 +77,12 @@ impl RenderGraphRunner {
recorder.begin_frame(); recorder.begin_frame();
} }
let mut render_context = let mut render_context = RenderContext::new(
RenderContext::new(render_device, adapter.get_info(), diagnostics_recorder); render_device,
#[cfg(not(all(target_arch = "wasm32", target_feature = "atomics")))]
adapter.get_info(),
diagnostics_recorder,
);
Self::run_graph(graph, None, &mut render_context, world, &[], None)?; Self::run_graph(graph, None, &mut render_context, world, &[], None)?;
finalizer(render_context.command_encoder()); finalizer(render_context.command_encoder());

2
crates/bevy_render/src/renderer/mod.rs
View File

@ -36,6 +36,7 @@ pub fn render_system(world: &mut World, state: &mut SystemState<Query<Entity, Wi
let graph = world.resource::<RenderGraph>(); let graph = world.resource::<RenderGraph>();
let render_device = world.resource::<RenderDevice>(); let render_device = world.resource::<RenderDevice>();
let render_queue = world.resource::<RenderQueue>(); let render_queue = world.resource::<RenderQueue>();
#[cfg(not(all(target_arch = "wasm32", target_feature = "atomics")))]
let render_adapter = world.resource::<RenderAdapter>(); let render_adapter = world.resource::<RenderAdapter>();
let res = RenderGraphRunner::run( let res = RenderGraphRunner::run(
@ -43,6 +44,7 @@ pub fn render_system(world: &mut World, state: &mut SystemState<Query<Entity, Wi
render_device.clone(), // TODO: is this clone really necessary? render_device.clone(), // TODO: is this clone really necessary?
diagnostics_recorder, diagnostics_recorder,
&render_queue.0, &render_queue.0,
#[cfg(not(all(target_arch = "wasm32", target_feature = "atomics")))]
&render_adapter.0, &render_adapter.0,
world, world,
|encoder| { |encoder| {