Skip to content

bevy_render: reconfigure surface on Suboptimal present #24463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubeniskov wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −2
Open

bevy_render: reconfigure surface on Suboptimal present #24463

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions crates/bevy_render/src/view/window/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,10 +301,29 @@ pub fn prepare_windows(

let surface = &surface_data.surface;
match surface.get_current_texture() {
wgpu::CurrentSurfaceTexture::Success(surface_texture)
| wgpu::CurrentSurfaceTexture::Suboptimal(surface_texture) => {
wgpu::CurrentSurfaceTexture::Success(surface_texture) => {
window.set_swapchain_texture(surface_texture);
}
wgpu::CurrentSurfaceTexture::Suboptimal(surface_texture) => {
// Suboptimal: the swapchain still presents but no longer matches the
// surface (compositor scale / output reconfig on desktop Linux is the
// common trigger). wgpu_hal logs a WARN every present until we
// reconfigure, so mirror the Outdated path: drop the frame,
// reconfigure, re-acquire.
drop(surface_texture);
render_device.configure_surface(surface, &surface_data.configuration);
let frame = match surface.get_current_texture() {
wgpu::CurrentSurfaceTexture::Success(surface_texture)
| wgpu::CurrentSurfaceTexture::Suboptimal(surface_texture) => surface_texture,
variant => {
warn!(
"Couldn't get swap chain texture after suboptimal reconfigure. Cause: '{variant:?}'"
);
continue;
}
};
window.set_swapchain_texture(frame);
}
#[cfg(target_os = "linux")]
wgpu::CurrentSurfaceTexture::Timeout if may_erroneously_timeout() => {
bevy_log::trace!(
Expand Down
Loading