fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-20 03:30:19 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

clients/simple-vulkan: move render_done semaphore to image

Browse source 
In some cases it is possible that a frame becomes available by its
fence but the last used swapchain image has still not been returned to
the swapchain. If the render_done semaphore is part of the frame struct
it will be reused and cause a validation error.
To prevent this from happening, move the render_done semaphore to the
image struct so that each of those semaphores is only used when the
associated image is safely acquired from the swapchain.

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
This commit is contained in:
Erico Nunes 2025-05-30 11:00:54 +02:00 • committed by Marius Vlad
parent feb4fd1386
commit a79e7c3e8d
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
clients/simple-vulkan.c
View file

@ -101,6 +101,7 @@ struct geometry {
struct window_image {
VkImageView image_view;
VkFramebuffer framebuffer;
VkSemaphore render_done;
};
struct window_buffer {
@ -110,7 +111,6 @@ struct window_buffer {
};
struct window_frame {
VkSemaphore render_done;
VkSemaphore image_acquired;
VkFence fence;
VkCommandBuffer cmd_buffer;
@ -368,9 +368,17 @@ create_swapchain(struct window *window)
assert(window->vk.image_count <= ARRAY_LENGTH(window->vk.images));
for (uint32_t i = 0; i < window->vk.image_count; i++) {
VkResult result;
create_image_view(window->vk.dev, swapchain_images[i], window->vk.format, &window->vk.images[i].image_view);
create_framebuffer(window->vk.dev, window->vk.renderpass, window->vk.images[i].image_view,
window->buffer_size.width, window->buffer_size.height, &window->vk.images[i].framebuffer);
const VkSemaphoreCreateInfo semaphore_create_info = {
.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
};
result = vkCreateSemaphore(window->vk.dev, &semaphore_create_info, NULL, &window->vk.images[i].render_done);
check_vk_success(result, "vkCreateSemaphore");
}
}
@ -380,6 +388,7 @@ destroy_swapchain(struct window *window)
vkDeviceWaitIdle(window->vk.dev);
for (uint32_t i = 0; i < window->vk.image_count; i++) {
vkDestroySemaphore(window->vk.dev, window->vk.images[i].render_done, NULL);
vkDestroyFramebuffer(window->vk.dev, window->vk.images[i].framebuffer, NULL);
vkDestroyImageView(window->vk.dev, window->vk.images[i].image_view, NULL);
}
@ -1124,8 +1133,6 @@ init_vulkan(struct window *window)
const VkSemaphoreCreateInfo semaphore_create_info = {
.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO,
};
result = vkCreateSemaphore(window->vk.dev, &semaphore_create_info, NULL, &frame->render_done);
check_vk_success(result, "vkCreateSemaphore");
result = vkCreateSemaphore(window->vk.dev, &semaphore_create_info, NULL, &frame->image_acquired);
check_vk_success(result, "vkCreateSemaphore");
@ -1154,7 +1161,6 @@ fini_vulkan(struct window *window)
for (uint32_t i = 0; i < MAX_CONCURRENT_FRAMES; ++i) {
struct window_frame *frame = &window->vk.frames[i];
vkDestroySemaphore(window->vk.dev, frame->image_acquired, NULL);
vkDestroySemaphore(window->vk.dev, frame->render_done, NULL);
vkFreeCommandBuffers(window->vk.dev, window->vk.cmd_pool, 1, &frame->cmd_buffer);
vkDestroyFence(window->vk.dev, frame->fence, NULL);
@ -1364,7 +1370,7 @@ draw_triangle(struct window *window, struct window_frame *frame, struct window_i
.commandBufferCount = 1,
.pCommandBuffers = &cmd_buffer,
.signalSemaphoreCount = 1,
.pSignalSemaphores = &frame->render_done,
.pSignalSemaphores = &image->render_done,
};
result = vkQueueSubmit(window->vk.queue, 1, &submit_info, frame->fence);
@ -1571,12 +1577,14 @@ redraw(struct window *window)
assert(image_index < ARRAY_LENGTH(window->vk.images));
draw_triangle(window, frame, &window->vk.images[image_index]);
struct window_image *image = &window->vk.images[image_index];
draw_triangle(window, frame, image);
VkPresentInfoKHR present_info = {
.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR,
.waitSemaphoreCount = 1,
.pWaitSemaphores = &frame->render_done,
.pWaitSemaphores = &image->render_done,
.swapchainCount = 1,
.pSwapchains = &window->vk.swapchain,
.pImageIndices = &image_index,