Skip to content

fix(wayland): get surface extent from window instead of surface prope… #1521

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
Kkaiwz wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −4
Open

fix(wayland): get surface extent from window instead of surface prope… #1521

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
18 changes: 14 additions & 4 deletions framework/rendering/render_context.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,23 +604,33 @@ inline bool RenderContext<bindingType>::handle_surface_changes(bool force_update
}

vk::SurfaceCapabilitiesKHR surface_properties = device.get_gpu().get_handle().getSurfaceCapabilitiesKHR(swapchain->get_surface());
vk::Extent2D cur_extent;

if (surface_properties.currentExtent.width == 0xFFFFFFFF)
#if defined(VK_USE_PLATFORM_WAYLAND_KHR)
// On Wayland, currentExtent is typically {0xFFFFFFFF, 0xFFFFFFFF}, meaning
// the application determines the surface size. We need to get the size from
// the window instead.
cur_extent = vk::Extent2D{window.get_extent().width, window.get_extent().height};
#else
cur_extent = surface_properties.currentExtent;
#endif

if (cur_extent.width == 0xFFFFFFFF || cur_extent.height == 0xFFFFFFFF)
{
return false;
}

// Only recreate the swapchain if the dimensions have changed;
// handle_surface_changes() is called on VK_SUBOPTIMAL_KHR,
// which might not be due to a surface resize
if (surface_properties.currentExtent.width != surface_extent.width || surface_properties.currentExtent.height != surface_extent.height || force_update)
if (cur_extent.width != surface_extent.width || cur_extent.height != surface_extent.height || force_update)
{
// Recreate swapchain
device.get_handle().waitIdle();

update_swapchain_impl(surface_properties.currentExtent, pre_transform);
update_swapchain_impl(cur_extent, pre_transform);

surface_extent = surface_properties.currentExtent;
surface_extent = cur_extent;

return true;
}
Expand Down
Loading