Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions crates/bevy_render/src/renderer/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,17 @@ pub fn render_system(

world.resource_scope(|world, mut windows: Mut<ExtractedWindows>| {
let views = state.get(world);
for (view_target, camera) in views.iter() {
if let Some(NormalizedRenderTarget::Window(window)) = camera.target
&& view_target.needs_present()
{
let Some(window) = windows.get_mut(&window.entity()) else {
continue;
};
for window in windows.values_mut() {
let view_needs_present = views.iter().any(|(view_target, camera)| {
matches!(
camera.target,
Some(NormalizedRenderTarget::Window(w)) if w.entity() == window.entity
) && view_target.needs_present()
});

if view_needs_present || window.needs_initial_present {
window.present();
window.needs_initial_present = false;
}
}
});
Expand Down
6 changes: 6 additions & 0 deletions crates/bevy_render/src/view/window/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ pub struct ExtractedWindow {
pub size_changed: bool,
pub present_mode_changed: bool,
pub alpha_mode: CompositeAlphaMode,
/// Whether this window needs an initial buffer commit.
///
/// On Wayland, windows must present at least once before they are shown.
/// See <https://wayland.app/protocols/xdg-shell#xdg_surface>
pub needs_initial_present: bool,
}

impl ExtractedWindow {
Expand Down Expand Up @@ -145,6 +150,7 @@ fn extract_windows(
swap_chain_texture_view_format: None,
present_mode_changed: false,
alpha_mode: window.composite_alpha_mode,
needs_initial_present: true,
});

if extracted_window.swap_chain_texture.is_none() {
Expand Down