Commit 41b4b8f4 authored by Varad Gautam's avatar Varad Gautam Committed by Daniel Stone

linux-dmabuf: advertise supported formats and modifiers

implement 'modifier' event to communicate available formats and modifiers
to the client and support zwp_linux_dmabuf_v1 interface version 3.

v2: handle zero modifiers case, deprecate 'format' event.
Signed-off-by: default avatarVarad Gautam <varad.gautam@collabora.com>
Reviewed-by: Daniel Stone's avatarDaniel Stone <daniels@collabora.com>
parent 0775cd11
......@@ -467,6 +467,11 @@ bind_linux_dmabuf(struct wl_client *client,
{
struct weston_compositor *compositor = data;
struct wl_resource *resource;
int *formats = NULL;
uint64_t *modifiers = NULL;
int num_formats, num_modifiers;
uint64_t modifier_invalid = DRM_FORMAT_MOD_INVALID;
int i, j;
resource = wl_resource_create(client, &zwp_linux_dmabuf_v1_interface,
version, id);
......@@ -478,9 +483,35 @@ bind_linux_dmabuf(struct wl_client *client,
wl_resource_set_implementation(resource, &linux_dmabuf_implementation,
compositor, NULL);
/* EGL_EXT_image_dma_buf_import does not provide a way to query the
* supported pixel formats. */
/* XXX: send formats */
/*
* Use EGL_EXT_image_dma_buf_import_modifiers to query and advertise
* format/modifier codes.
*/
compositor->renderer->query_dmabuf_formats(compositor, &formats,
&num_formats);
for (i = 0; i < num_formats; i++) {
compositor->renderer->query_dmabuf_modifiers(compositor,
formats[i],
&modifiers,
&num_modifiers);
/* send DRM_FORMAT_MOD_INVALID token when no modifiers are supported
* for this format */
if (num_modifiers == 0) {
num_modifiers = 1;
modifiers = &modifier_invalid;
}
for (j = 0; j < num_modifiers; j++) {
uint32_t modifier_lo = modifiers[j] & 0xFFFFFFFF;
uint32_t modifier_hi = modifiers[j] >> 32;
zwp_linux_dmabuf_v1_send_modifier(resource, formats[i],
modifier_hi,
modifier_lo);
}
free(modifiers);
}
free(formats);
}
/** Advertise linux_dmabuf support
......@@ -498,7 +529,7 @@ WL_EXPORT int
linux_dmabuf_setup(struct weston_compositor *compositor)
{
if (!wl_global_create(compositor->wl_display,
&zwp_linux_dmabuf_v1_interface, 2,
&zwp_linux_dmabuf_v1_interface, 3,
compositor, bind_linux_dmabuf))
return -1;
......
......@@ -29,6 +29,9 @@
#include <stdint.h>
#define MAX_DMABUF_PLANES 4
#ifndef DRM_FORMAT_MOD_INVALID
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
#endif
struct linux_dmabuf_buffer;
typedef void (*dmabuf_user_data_destroy_func)(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment