From e17a219885b1914a7f87ceb4516446b64eb5b906 Mon Sep 17 00:00:00 2001 From: Derek Foreman Date: Mon, 4 May 2026 12:00:10 -0500 Subject: [PATCH] renderers/clients: Bump gbm version requirement to 21.3 Drop support for libgbm versions without gbm_bo_create_with_modifiers Signed-off-by: Derek Foreman --- clients/meson.build | 5 +---- clients/simple-dmabuf-egl.c | 9 --------- clients/simple-dmabuf-feedback.c | 7 ------- clients/simple-dmabuf-vulkan.c | 9 --------- libweston/renderer-gl/gl-renderer.c | 7 +------ libweston/renderer-vulkan/vulkan-renderer.c | 7 +------ 6 files changed, 3 insertions(+), 41 deletions(-) diff --git a/clients/meson.build b/clients/meson.build index 7cf590669..2b96aa543 100644 --- a/clients/meson.build +++ b/clients/meson.build @@ -42,10 +42,7 @@ dep_toytoolkit = declare_dependency( link_with: lib_toytoolkit, dependencies: deps_toytoolkit, ) -dep_gbm = dependency('gbm', required: false, version: '>= 21.1.1') -if dep_gbm.found() and dep_gbm.version().version_compare('>= 21.3') - config_h.set('HAVE_GBM_BO_CREATE_WITH_MODIFIERS2', '1') -endif +dep_gbm = dependency('gbm', required: false, version: '>= 21.3') simple_clients_enabled = get_option('simple-clients') simple_build_all = simple_clients_enabled.contains('all') diff --git a/clients/simple-dmabuf-egl.c b/clients/simple-dmabuf-egl.c index db22a210e..15435ca95 100644 --- a/clients/simple-dmabuf-egl.c +++ b/clients/simple-dmabuf-egl.c @@ -340,7 +340,6 @@ create_dmabuf_buffer(struct display *display, struct buffer *buffer, buffer->release_fence_fd = -1; if (display->modifiers_count > 0) { -#ifdef HAVE_GBM_BO_CREATE_WITH_MODIFIERS2 buffer->bo = gbm_bo_create_with_modifiers2(display->gbm.device, buffer->width, buffer->height, @@ -348,14 +347,6 @@ create_dmabuf_buffer(struct display *display, struct buffer *buffer, display->modifiers, display->modifiers_count, GBM_BO_USE_RENDERING); -#else - buffer->bo = gbm_bo_create_with_modifiers(display->gbm.device, - buffer->width, - buffer->height, - buffer->format, - display->modifiers, - display->modifiers_count); -#endif if (buffer->bo) buffer->modifier = gbm_bo_get_modifier(buffer->bo); } diff --git a/clients/simple-dmabuf-feedback.c b/clients/simple-dmabuf-feedback.c index 0ba5ae430..fdbe658ae 100644 --- a/clients/simple-dmabuf-feedback.c +++ b/clients/simple-dmabuf-feedback.c @@ -547,18 +547,11 @@ create_dmabuf_buffer(struct window *window, struct buffer *buf, uint32_t width, buf->format = format; if (count_modifiers > 0) { -#ifdef HAVE_GBM_BO_CREATE_WITH_MODIFIERS2 buf->bo = gbm_bo_create_with_modifiers2(display->gbm_device, buf->width, buf->height, format, modifiers, count_modifiers, bo_flags); -#else - buf->bo = gbm_bo_create_with_modifiers(display->gbm_device, - buf->width, buf->height, - format, modifiers, - count_modifiers); -#endif if (buf->bo) buf->modifier = gbm_bo_get_modifier(buf->bo); } diff --git a/clients/simple-dmabuf-vulkan.c b/clients/simple-dmabuf-vulkan.c index 50be3496a..ee1fab044 100644 --- a/clients/simple-dmabuf-vulkan.c +++ b/clients/simple-dmabuf-vulkan.c @@ -549,7 +549,6 @@ create_dmabuf_buffer(struct display *display, struct buffer *buffer, buffer->release_fence_fd = -1; if (display->modifiers_count > 0) { -#ifdef HAVE_GBM_BO_CREATE_WITH_MODIFIERS2 buffer->bo = gbm_bo_create_with_modifiers2(display->gbm.device, buffer->width, buffer->height, @@ -557,14 +556,6 @@ create_dmabuf_buffer(struct display *display, struct buffer *buffer, display->modifiers, display->modifiers_count, GBM_BO_USE_RENDERING); -#else - buffer->bo = gbm_bo_create_with_modifiers(display->gbm.device, - buffer->width, - buffer->height, - buffer->format, - display->modifiers, - display->modifiers_count); -#endif if (buffer->bo) buffer->modifier = gbm_bo_get_modifier(buffer->bo); } diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c index df9867def..50bc4c142 100644 --- a/libweston/renderer-gl/gl-renderer.c +++ b/libweston/renderer-gl/gl-renderer.c @@ -4966,16 +4966,11 @@ gl_renderer_dmabuf_alloc(struct weston_renderer *renderer, 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, modifiers, count, GBM_BO_USE_RENDERING); -#else - bo = gbm_bo_create_with_modifiers(allocator->gbm_device, - width, height, format, - modifiers, count); -#endif if (!bo) bo = gbm_bo_create(allocator->gbm_device, width, height, format, diff --git a/libweston/renderer-vulkan/vulkan-renderer.c b/libweston/renderer-vulkan/vulkan-renderer.c index fa53e99a1..5d95858b8 100644 --- a/libweston/renderer-vulkan/vulkan-renderer.c +++ b/libweston/renderer-vulkan/vulkan-renderer.c @@ -770,16 +770,11 @@ vulkan_renderer_dmabuf_alloc(struct weston_renderer *renderer, 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, modifiers, count, GBM_BO_USE_RENDERING); -#else - bo = gbm_bo_create_with_modifiers(allocator->gbm_device, - width, height, format, - modifiers, count); -#endif if (!bo) bo = gbm_bo_create(allocator->gbm_device, width, height, format,