fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 09:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'vulkan' into 'vulkan'

Browse source 
Vulkan WSI Wayland fixes

Two small fixes to make mailbox mode actually work again.

See merge request !4
This commit is contained in:
Jason Ekstrand 2016-01-30 10:28:12 -05:00
commit 1a442a7923
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/vulkan/anv_wsi_wayland.c
View file

@ -521,8 +521,8 @@ wsi_wl_swapchain_acquire_next_image(struct anv_swapchain *anv_chain,
/* This time we do a blocking dispatch because we can't go
* anywhere until we get an event.
*/
int ret = wl_display_dispatch_queue(chain->display->display,
chain->queue);
int ret = wl_display_roundtrip_queue(chain->display->display,
chain->queue);
if (ret < 0)
return vk_error(VK_ERROR_OUT_OF_DATE_KHR);
}
@ -569,6 +569,7 @@ wsi_wl_swapchain_queue_present(struct anv_swapchain *anv_chain,
chain->fifo_ready = false;
}
chain->images[image_index].busy = true;
wl_surface_commit(chain->surface);
wl_display_flush(chain->display->display);