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

vulkan/wsi/wayland: Use host pointer import when available

Browse source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17388>
This commit is contained in:
Jason Ekstrand 2022-07-06 17:27:42 -05:00
parent 54fa5ff406
commit aca545d616
1 changed files with 46 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
src/vulkan/wsi/wsi_common_wayland.c
View file

@ -909,8 +909,9 @@ struct wsi_wl_image {
struct wsi_image base; struct wsi_image base;
struct wl_buffer * buffer; struct wl_buffer * buffer;
bool busy; bool busy;
void * data_ptr; int shm_fd;
uint32_t data_size; void * shm_ptr;
unsigned shm_size;
}; };
struct wsi_wl_swapchain { struct wsi_wl_swapchain {
@ -1043,9 +1044,9 @@ wsi_wl_swapchain_queue_present(struct wsi_swapchain *wsi_chain,
{ {
struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain; struct wsi_wl_swapchain *chain = (struct wsi_wl_swapchain *)wsi_chain;
if (chain->display->sw) { if (!chain->base.wsi->has_import_memory_host) {
struct wsi_wl_image *image = &chain->images[image_index]; struct wsi_wl_image *image = &chain->images[image_index];
memcpy(image->data_ptr, image->base.cpu_map, memcpy(image->shm_ptr, image->base.cpu_map,
image->base.row_pitches[0] * chain->extent.height); image->base.row_pitches[0] * chain->extent.height);
} }
if (chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR) { if (chain->base.present_mode == VK_PRESENT_MODE_FIFO_KHR) {
@ -1100,6 +1101,29 @@ static const struct wl_buffer_listener buffer_listener = {
buffer_handle_release, buffer_handle_release,
}; };
static uint8_t *
wsi_wl_alloc_image_shm(struct wsi_image *imagew, unsigned size)
{
struct wsi_wl_image *image = (struct wsi_wl_image *)imagew;
/* Create a shareable buffer */
int fd = os_create_anonymous_file(size, NULL);
if (fd < 0)
return NULL;
void *ptr = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (ptr == MAP_FAILED) {
close(fd);
return NULL;
}
image->shm_fd = fd;
image->shm_ptr = ptr;
image->shm_size = size;
return ptr;
}
static VkResult static VkResult
wsi_wl_image_init(struct wsi_wl_swapchain *chain, wsi_wl_image_init(struct wsi_wl_swapchain *chain,
struct wsi_wl_image *image, struct wsi_wl_image *image,
@ -1115,29 +1139,24 @@ wsi_wl_image_init(struct wsi_wl_swapchain *chain,
return result; return result;
if (display->sw) { if (display->sw) {
int fd, stride; if (chain->base.wsi->has_import_memory_host) {
assert(image->shm_ptr != NULL);
stride = image->base.row_pitches[0]; } else {
image->data_size = stride * chain->extent.height; assert(image->shm_ptr == NULL);
wsi_wl_alloc_image_shm(&image->base, image->base.row_pitches[0] *
/* Create a shareable buffer */ chain->extent.height);
fd = os_create_anonymous_file(image->data_size, NULL);
if (fd < 0)
goto fail_image;
image->data_ptr = mmap(NULL, image->data_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (image->data_ptr == MAP_FAILED) {
close(fd);
goto fail_image;
} }
/* Share it in a wl_buffer */ /* Share it in a wl_buffer */
struct wl_shm_pool *pool = wl_shm_create_pool(display->wl_shm, fd, image->data_size); struct wl_shm_pool *pool = wl_shm_create_pool(display->wl_shm,
image->shm_fd,
image->shm_size);
wl_proxy_set_queue((struct wl_proxy *)pool, display->queue); wl_proxy_set_queue((struct wl_proxy *)pool, display->queue);
image->buffer = wl_shm_pool_create_buffer(pool, 0, chain->extent.width, image->buffer = wl_shm_pool_create_buffer(pool, 0, chain->extent.width,
chain->extent.height, stride, chain->extent.height,
image->base.row_pitches[0],
chain->shm_format); chain->shm_format);
wl_shm_pool_destroy(pool); wl_shm_pool_destroy(pool);
close(fd);
} else { } else {
assert(display->wl_dmabuf); assert(display->wl_dmabuf);
@ -1185,8 +1204,10 @@ wsi_wl_swapchain_images_free(struct wsi_wl_swapchain *chain)
if (chain->images[i].buffer) { if (chain->images[i].buffer) {
wl_buffer_destroy(chain->images[i].buffer); wl_buffer_destroy(chain->images[i].buffer);
wsi_destroy_image(&chain->base, &chain->images[i].base); wsi_destroy_image(&chain->base, &chain->images[i].base);
if (chain->images[i].data_ptr) if (chain->images[i].shm_size) {
munmap(chain->images[i].data_ptr, chain->images[i].data_size); close(chain->images[i].shm_fd);
munmap(chain->images[i].shm_ptr, chain->images[i].shm_size);
}
} }
} }
wsi_destroy_image_info(&chain->base, &chain->base.image_info); wsi_destroy_image_info(&chain->base, &chain->base.image_info);
@ -1307,7 +1328,8 @@ wsi_wl_surface_create_swapchain(VkIcdSurfaceBase *icd_surface,
if (wsi_device->sw) { if (wsi_device->sw) {
result = wsi_configure_cpu_image(&chain->base, pCreateInfo, result = wsi_configure_cpu_image(&chain->base, pCreateInfo,
NULL /* alloc_shm */, wsi_device->has_import_memory_host ?
wsi_wl_alloc_image_shm : NULL,
&chain->base.image_info); &chain->base.image_info);
} else { } else {
result = wsi_configure_native_image(&chain->base, pCreateInfo, result = wsi_configure_native_image(&chain->base, pCreateInfo,