fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 18:00:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vulkan/wsi/x11: add sent image counter

Browse source 
Add a counter to count how many images from our swapchain are currently "sent"
to the X server via Present extension. An image is sent when it has been
presented but we have not yet received an idle event for it.

CC: mesa-stable
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Reviewed-by: Simon Ser <contact@emersion.fr>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6513>
This commit is contained in:
Roman Gilg 2020-08-31 11:33:27 +02:00
parent 68957a8256
commit d0bc1ad377
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/vulkan/wsi/wsi_common_x11.c
View file

@ -752,6 +752,7 @@ struct x11_swapchain {
uint64_t send_sbc; uint64_t send_sbc;
uint64_t last_present_msc; uint64_t last_present_msc;
uint32_t stamp; uint32_t stamp;
int sent_image_count;
bool has_present_queue; bool has_present_queue;
bool has_acquire_queue; bool has_acquire_queue;
@ -848,6 +849,8 @@ x11_handle_dri3_present_event(struct x11_swapchain *chain,
for (unsigned i = 0; i < chain->base.image_count; i++) { for (unsigned i = 0; i < chain->base.image_count; i++) {
if (chain->images[i].pixmap == idle->pixmap) { if (chain->images[i].pixmap == idle->pixmap) {
chain->images[i].busy = false; chain->images[i].busy = false;
chain->sent_image_count--;
assert(chain->sent_image_count >= 0);
if (chain->has_acquire_queue) if (chain->has_acquire_queue)
wsi_queue_push(&chain->acquire_queue, i); wsi_queue_push(&chain->acquire_queue, i);
break; break;
@ -1028,7 +1031,11 @@ x11_present_to_x11_dri3(struct x11_swapchain *chain, uint32_t image_index,
xshmfence_reset(image->shm_fence); xshmfence_reset(image->shm_fence);
++chain->sent_image_count;
assert(chain->sent_image_count <= chain->base.image_count);
++chain->send_sbc; ++chain->send_sbc;
xcb_void_cookie_t cookie = xcb_void_cookie_t cookie =
xcb_present_pixmap(chain->conn, xcb_present_pixmap(chain->conn,
chain->window, chain->window,
@ -1524,6 +1531,7 @@ x11_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
chain->depth = bit_depth; chain->depth = bit_depth;
chain->extent = pCreateInfo->imageExtent; chain->extent = pCreateInfo->imageExtent;
chain->send_sbc = 0; chain->send_sbc = 0;
chain->sent_image_count = 0;
chain->last_present_msc = 0; chain->last_present_msc = 0;
chain->has_acquire_queue = false; chain->has_acquire_queue = false;
chain->has_present_queue = false; chain->has_present_queue = false;