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 <derek.foreman@collabora.com>

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')

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);
 	}

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);
 	}

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);
 	}

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,

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,