struct wsi_wayland;
struct wsi_wl_display {
- struct wl_display * display;
+ /* The real wl_display */
+ struct wl_display * wl_display;
+ /* Actually a proxy wrapper around the event queue */
+ struct wl_display * wl_display_wrapper;
+ struct wl_event_queue * queue;
struct wl_drm * drm;
struct wsi_wayland *wsi_wl;
u_vector_finish(&display->formats);
if (display->drm)
wl_drm_destroy(display->drm);
+ if (display->wl_display_wrapper)
+ wl_proxy_wrapper_destroy(display->wl_display_wrapper);
+ if (display->queue)
+ wl_event_queue_destroy(display->queue);
vk_free(wsi->alloc, display);
}
memset(display, 0, sizeof(*display));
- display->display = wl_display;
display->wsi_wl = wsi;
+ display->wl_display = wl_display;
if (!u_vector_init(&display->formats, sizeof(VkFormat), 8))
goto fail;
- struct wl_registry *registry = wl_display_get_registry(wl_display);
+ display->queue = wl_display_create_queue(wl_display);
+ if (!display->queue)
+ goto fail;
+
+ display->wl_display_wrapper = wl_proxy_create_wrapper(wl_display);
+ if (!display->wl_display_wrapper)
+ goto fail;
+
+ wl_proxy_set_queue((struct wl_proxy *) display->wl_display_wrapper,
+ display->queue);
+
+ struct wl_registry *registry =
+ wl_display_get_registry(display->wl_display_wrapper);
if (!registry)
goto fail;
wl_registry_add_listener(registry, ®istry_listener, display);
- /* Round-rip to get the wl_drm global */
- wl_display_roundtrip(wl_display);
+ /* Round-trip to get the wl_drm global */
+ wl_display_roundtrip_queue(display->wl_display, display->queue);
if (!display->drm)
goto fail_registry;
- /* Round-rip to get wl_drm formats and capabilities */
- wl_display_roundtrip(wl_display);
+ /* Round-trip to get wl_drm formats and capabilities */
+ wl_display_roundtrip_queue(display->wl_display, display->queue);
/* We need prime support */
if (!(display->capabilities & WL_DRM_CAPABILITY_PRIME))
struct wl_event_queue * queue;
struct wl_surface * surface;
uint32_t surface_version;
+ struct wl_drm * drm_wrapper;
VkExtent2D extent;
VkFormat vk_format;
{
struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
- int ret = wl_display_dispatch_queue_pending(chain->display->display,
+ int ret = wl_display_dispatch_queue_pending(chain->display->wl_display,
chain->queue);
/* XXX: I'm not sure if out-of-date is the right error here. If
* wl_display_dispatch_queue_pending fails it most likely means we got
/* This time we do a blocking dispatch because we can't go
* anywhere until we get an event.
*/
- int ret = wl_display_roundtrip_queue(chain->display->display,
+ int ret = wl_display_roundtrip_queue(chain->display->wl_display,
chain->queue);
if (ret < 0)
return VK_ERROR_OUT_OF_DATE_KHR;
if (chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR) {
while (!chain->fifo_ready) {
- int ret = wl_display_dispatch_queue(chain->display->display,
+ int ret = wl_display_dispatch_queue(chain->display->wl_display,
chain->queue);
if (ret < 0)
return VK_ERROR_OUT_OF_DATE_KHR;
if (chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR) {
struct wl_callback *frame = wl_surface_frame(chain->surface);
- wl_proxy_set_queue((struct wl_proxy *)frame, chain->queue);
wl_callback_add_listener(frame, &frame_listener, chain);
chain->fifo_ready = false;
}
chain->images[image_index].busy = true;
wl_surface_commit(chain->surface);
- wl_display_flush(chain->display->display);
+ wl_display_flush(chain->display->wl_display);
return VK_SUCCESS;
}
if (result != VK_SUCCESS)
return result;
- image->buffer = wl_drm_create_prime_buffer(chain->display->drm,
+ image->buffer = wl_drm_create_prime_buffer(chain->drm_wrapper,
fd, /* name */
chain->extent.width,
chain->extent.height,
if (!image->buffer)
goto fail_image;
- wl_proxy_set_queue((struct wl_proxy *)image->buffer, chain->queue);
wl_buffer_add_listener(image->buffer, &buffer_listener, image);
return VK_SUCCESS;
chain->images[i].memory);
}
+ if (chain->surface)
+ wl_proxy_wrapper_destroy(chain->surface);
+ if (chain->drm_wrapper)
+ wl_proxy_wrapper_destroy(chain->drm_wrapper);
+ if (chain->queue)
+ wl_event_queue_destroy(chain->queue);
+
vk_free(pAllocator, chain);
return VK_SUCCESS;
if (chain == NULL)
return VK_ERROR_OUT_OF_HOST_MEMORY;
+ /* Mark a bunch of stuff as NULL. This way we can just call
+ * destroy_swapchain for cleanup.
+ */
+ for (uint32_t i = 0; i < num_images; i++)
+ chain->images[i].buffer = NULL;
+ chain->queue = NULL;
+ chain->surface = NULL;
+ chain->drm_wrapper = NULL;
+
bool alpha = pCreateInfo->compositeAlpha ==
VK_COMPOSITE_ALPHA_PRE_MULTIPLIED_BIT_KHR;
chain->base.present_mode = pCreateInfo->presentMode;
chain->base.image_count = num_images;
chain->base.needs_linear_copy = false;
- chain->surface = surface->surface;
- chain->surface_version = wl_proxy_get_version((void *)surface->surface);
chain->extent = pCreateInfo->imageExtent;
chain->vk_format = pCreateInfo->imageFormat;
chain->drm_format = wl_drm_format_for_vk_format(chain->vk_format, alpha);
- chain->fifo_ready = true;
-
- /* Mark a bunch of stuff as NULL. This way we can just call
- * destroy_swapchain for cleanup.
- */
- for (uint32_t i = 0; i < chain->base.image_count; i++)
- chain->images[i].buffer = NULL;
- chain->queue = NULL;
-
- chain->display = wsi_wl_get_display(wsi_device,
- surface->display);
+ chain->display = wsi_wl_get_display(wsi_device, surface->display);
if (!chain->display) {
result = VK_ERROR_INITIALIZATION_FAILED;
goto fail;
}
- chain->queue = wl_display_create_queue(chain->display->display);
+ chain->queue = wl_display_create_queue(chain->display->wl_display);
if (!chain->queue) {
result = VK_ERROR_INITIALIZATION_FAILED;
goto fail;
}
+ chain->surface = wl_proxy_create_wrapper(surface->surface);
+ if (!chain->surface) {
+ result = VK_ERROR_INITIALIZATION_FAILED;
+ goto fail;
+ }
+ wl_proxy_set_queue((struct wl_proxy *) chain->surface, chain->queue);
+ chain->surface_version = wl_proxy_get_version((void *)surface->surface);
+
+ chain->drm_wrapper = wl_proxy_create_wrapper(chain->display->drm);
+ if (!chain->drm_wrapper) {
+ result = VK_ERROR_INITIALIZATION_FAILED;
+ goto fail;
+ }
+ wl_proxy_set_queue((struct wl_proxy *) chain->drm_wrapper, chain->queue);
+
+ chain->fifo_ready = true;
+
for (uint32_t i = 0; i < chain->base.image_count; i++) {
result = wsi_wl_image_init(chain, &chain->images[i],
pCreateInfo, pAllocator);
projects / mesa.git / blobdiff