From 7343b8d8174041d36a27070aeb0dcbc32b2e5b58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Wed, 20 May 2020 12:49:36 +0200 Subject: [PATCH] wayland/dma-buf: Make gbm_bo import function better named It imports a DMA buffer as a gbm_bo, but only if it can be used to scan it out, so name it import_scanout_gbm_bo(). https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1261 --- src/wayland/meta-wayland-dma-buf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/wayland/meta-wayland-dma-buf.c b/src/wayland/meta-wayland-dma-buf.c index ada2b5cc1..1faea44df 100644 --- a/src/wayland/meta-wayland-dma-buf.c +++ b/src/wayland/meta-wayland-dma-buf.c @@ -185,10 +185,10 @@ meta_wayland_dma_buf_buffer_attach (MetaWaylandBuffer *buffer, #ifdef HAVE_NATIVE_BACKEND static struct gbm_bo * -create_gbm_bo (MetaWaylandDmaBufBuffer *dma_buf, - MetaGpuKms *gpu_kms, - int n_planes, - gboolean *use_modifier) +import_scanout_gbm_bo (MetaWaylandDmaBufBuffer *dma_buf, + MetaGpuKms *gpu_kms, + int n_planes, + gboolean *use_modifier) { struct gbm_device *gbm_device; @@ -276,7 +276,7 @@ meta_wayland_dma_buf_try_acquire_scanout (MetaWaylandDmaBufBuffer *dma_buf, return NULL; gpu_kms = meta_renderer_native_get_primary_gpu (renderer_native); - gbm_bo = create_gbm_bo (dma_buf, gpu_kms, n_planes, &use_modifier); + gbm_bo = import_scanout_gbm_bo (dma_buf, gpu_kms, n_planes, &use_modifier); if (!gbm_bo) { g_debug ("Failed to import scanout gbm_bo: %s", g_strerror (errno));