fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2026-01-06 22:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

gl-renderer: make DMABUF allocator optional

Browse source 
The dmabuf allocator pulls in libgbm which lives inside Mesa and is built
as a non-standalone part Mesa. This makes gl-renderer hard-wired to Mesa.

The allocator is only used by an optional pipewire backend so make
the allocator optional too.

Signed-off-by: Tomek Bury <tomek.bury@gmail.com>
This commit is contained in:
Tomek Bury 2024-11-19 16:16:14 +00:00 • committed by Pekka Paalanen
parent bf7b2311e7
commit b14461b13b
3 changed files with 30 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libweston/meson.build
View file

@ -88,6 +88,9 @@ subdir('desktop')
subdir('shell-utils')
dep_gbm = dependency('gbm', required: false, version: '>= 21.1.1')
if dep_gbm.found()
config_h.set('HAVE_GBM', '1')
endif
if get_option('backend-vnc')
dep_pam = dependency('pam', required: false)

28
libweston/renderer-gl/gl-renderer.c
View file

@ -43,7 +43,9 @@
#include <linux/input.h>
#include <unistd.h>
#ifdef HAVE_GBM
#include <gbm.h>
#endif
#include "linux-sync-file.h"
#include "timeline.h"
@ -152,6 +154,11 @@ struct gl_capture_task {
int fd;
};
#ifndef HAVE_GBM
struct gbm_device;
struct gbm_bo;
#endif
struct dmabuf_allocator {
struct gbm_device *gbm_device;
bool has_own_device;
@ -4207,6 +4214,7 @@ gl_renderer_remove_renderbuffer_dmabuf(struct weston_output *output,
gl_renderer_remove_renderbuffer(gl_renderbuffer);
}
#ifdef HAVE_GBM
static void
gl_renderer_dmabuf_destroy(struct linux_dmabuf_memory *dmabuf)
{
@ -4224,6 +4232,7 @@ gl_renderer_dmabuf_destroy(struct linux_dmabuf_memory *dmabuf)
gbm_bo_destroy(gl_renderer_dmabuf->bo);
free(gl_renderer_dmabuf);
}
#endif
static struct linux_dmabuf_memory *
gl_renderer_dmabuf_alloc(struct weston_renderer *renderer,
@ -4233,15 +4242,16 @@ gl_renderer_dmabuf_alloc(struct weston_renderer *renderer,
{
struct gl_renderer *gr = (struct gl_renderer *)renderer;
struct dmabuf_allocator *allocator = gr->allocator;
struct gl_renderer_dmabuf_memory *gl_renderer_dmabuf;
struct linux_dmabuf_memory *dmabuf;
struct dmabuf_attributes *attributes;
struct gbm_bo *bo;
int i;
struct linux_dmabuf_memory *dmabuf = NULL;
if (!allocator)
return NULL;
#ifdef HAVE_GBM
struct gl_renderer_dmabuf_memory *gl_renderer_dmabuf;
struct dmabuf_attributes *attributes;
struct gbm_bo *bo;
int i;
#ifdef HAVE_GBM_BO_CREATE_WITH_MODIFIERS2
bo = gbm_bo_create_with_modifiers2(allocator->gbm_device,
width, height, format,
@ -4280,6 +4290,7 @@ gl_renderer_dmabuf_alloc(struct weston_renderer *renderer,
dmabuf = &gl_renderer_dmabuf->base;
dmabuf->attributes = attributes;
dmabuf->destroy = gl_renderer_dmabuf_destroy;
#endif
return dmabuf;
}
@ -4340,9 +4351,14 @@ gl_renderer_allocator_destroy(struct dmabuf_allocator *allocator)
if (!allocator)
return;
#ifdef HAVE_GBM
if (allocator->gbm_device && allocator->has_own_device)
gbm_device_destroy(allocator->gbm_device);
#else
assert(!allocator->has_own_device);
#endif
free(allocator);
}
@ -4356,11 +4372,13 @@ gl_renderer_allocator_create(struct gl_renderer *gr,
if (options->egl_platform == EGL_PLATFORM_GBM_KHR)
gbm = options->egl_native_display;
#ifdef HAVE_GBM
if (!gbm && gr->drm_device) {
int fd = open(gr->drm_device, O_RDWR);
gbm = gbm_create_device(fd);
has_own_device = true;
}
#endif
if (!gbm)
return NULL;

5
libweston/renderer-gl/meson.build
View file

@ -30,7 +30,6 @@ srcs_renderer_gl = [
]
deps_renderer_gl = [
dep_gbm,
dep_libm,
dep_pixman,
dep_libweston_private,
@ -38,6 +37,10 @@ deps_renderer_gl = [
dep_vertex_clipping
]
if dep_gbm.found()
deps_renderer_gl += dep_gbm
endif
foreach name : [ 'egl', 'glesv2' ]
d = dependency(name, required: false)
if not d.found()