Skip to content

cube: Recreate suboptimal swapchains #1245

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

cube: Recreate suboptimal swapchains #1245

Show file tree
Hide file tree
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
16 changes: 9 additions & 7 deletions cube/cube.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,7 @@ struct demo {
SwapchainImageResources swapchain_resources[MAX_SWAPCHAIN_IMAGE_COUNT];
VkPresentModeKHR presentMode;
bool first_swapchain_frame;
bool swapchain_suboptimal;

VkCommandPool cmd_pool;
VkCommandPool present_cmd_pool;
Expand Down Expand Up @@ -1165,6 +1166,7 @@ static void demo_draw(struct demo *demo) {
vkWaitForFences(demo->device, 1, &current_submission.fence, VK_TRUE, UINT64_MAX);

uint32_t current_swapchain_image_index;
bool acquired_suboptimal_swapchain = false;
do {
// Get the index of the next available swapchain image:
err = vkAcquireNextImageKHR(demo->device, demo->swapchain, UINT64_MAX, current_submission.image_acquired_semaphore,
Expand All @@ -1177,6 +1179,7 @@ static void demo_draw(struct demo *demo) {
} else if (err == VK_SUBOPTIMAL_KHR) {
// demo->swapchain is not as optimal as it could be, but the platform's
// presentation engine will still present the image correctly.
acquired_suboptimal_swapchain = true;
break;
} else if (err == VK_ERROR_SURFACE_LOST_KHR) {
vkDestroySurfaceKHR(demo->inst, demo->surface, NULL);
Expand Down Expand Up @@ -1345,13 +1348,11 @@ static void demo_draw(struct demo *demo) {
// demo->swapchain is out of date (e.g. the window was resized) and
// must be recreated:
demo_resize(demo);
} else if (err == VK_SUBOPTIMAL_KHR) {
// SUBOPTIMAL could be due to a resize
VkSurfaceCapabilitiesKHR surfCapabilities;
err = vkGetPhysicalDeviceSurfaceCapabilitiesKHR(demo->gpu, demo->surface, &surfCapabilities);
assert(!err);
if (surfCapabilities.currentExtent.width != (uint32_t)demo->width ||
surfCapabilities.currentExtent.height != (uint32_t)demo->height) {
} else if (err == VK_SUBOPTIMAL_KHR || (err == VK_SUCCESS && acquired_suboptimal_swapchain)) {
// Try once to adapt to changes such as new Wayland DMA-BUF feedback,
// but don't recreate every frame if the condition persists.
if (!demo->swapchain_suboptimal) {
demo->swapchain_suboptimal = true;
demo_resize(demo);
}
} else if (err == VK_ERROR_SURFACE_LOST_KHR) {
Expand All @@ -1360,6 +1361,7 @@ static void demo_draw(struct demo *demo) {
demo_resize(demo);
} else {
assert(!err);
demo->swapchain_suboptimal = false;
}
}

Expand Down
16 changes: 10 additions & 6 deletions cube/cube.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,6 +506,7 @@ struct Demo {
std::vector<SwapchainImageResources> swapchain_resources;
vk::PresentModeKHR presentMode = vk::PresentModeKHR::eFifo;
bool first_swapchain_frame;
bool swapchain_suboptimal = false;

vk::CommandPool cmd_pool;
vk::CommandPool present_cmd_pool;
Expand Down Expand Up @@ -867,6 +868,7 @@ void Demo::draw() {

vk::Result acquire_result;
uint32_t current_swapchain_image_index = 0;
bool acquired_suboptimal_swapchain = false;
do {
acquire_result = device.acquireNextImageKHR(swapchain, UINT64_MAX, current_submission.image_acquired_semaphore, vk::Fence(),
&current_swapchain_image_index);
Expand All @@ -877,6 +879,7 @@ void Demo::draw() {
} else if (acquire_result == vk::Result::eSuboptimalKHR) {
// swapchain is not as optimal as it could be, but the platform's
// presentation engine will still present the image correctly.
acquired_suboptimal_swapchain = true;
break;
} else if (acquire_result == vk::Result::eErrorSurfaceLostKHR) {
inst.destroySurfaceKHR(surface);
Expand Down Expand Up @@ -951,12 +954,12 @@ void Demo::draw() {
// swapchain is out of date (e.g. the window was resized) and
// must be recreated:
resize();
} else if (present_result == vk::Result::eSuboptimalKHR) {
// SUBOPTIMAL could be due to resize
vk::SurfaceCapabilitiesKHR surfCapabilities;
auto caps_result = gpu.getSurfaceCapabilitiesKHR(surface, &surfCapabilities);
VERIFY(caps_result == vk::Result::eSuccess);
if (surfCapabilities.currentExtent.width != width || surfCapabilities.currentExtent.height != height) {
} else if (present_result == vk::Result::eSuboptimalKHR ||
(present_result == vk::Result::eSuccess && acquired_suboptimal_swapchain)) {
// Try once to adapt to changes such as new Wayland DMA-BUF feedback,
// but don't recreate every frame if the condition persists.
if (!swapchain_suboptimal) {
swapchain_suboptimal = true;
resize();
}
} else if (present_result == vk::Result::eErrorSurfaceLostKHR) {
Expand All @@ -965,6 +968,7 @@ void Demo::draw() {
resize();
} else {
VERIFY(present_result == vk::Result::eSuccess);
swapchain_suboptimal = false;
}
}

Expand Down