mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-dmabuf: send deprecated format events

Browse Source 
Although the format event is deprecated, some clients, especially the
GStreamer waylandsink, only support zwp_linux_dmabuf_v1 version 1 and
require the deprecated format event.

Send format events instead of the modifier event, if the client binds on
a protocol version before version 3, skipping formats that only support
non-linear modifiers.

Signed-off-by: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Michael Tretter
2018-01-17 17:54:31 +01:00
committed by Daniel Stone
parent 99ef816fd1
commit b0a749dcb3
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/linux-dmabuf.c
+12 -7
View File
@@ -488,8 +488,6 @@ bind_linux_dmabuf(struct wl_client *client,
wl_resource_set_implementation(resource, &linux_dmabuf_implementation, wl_resource_set_implementation(resource, &linux_dmabuf_implementation,
compositor, NULL); compositor, NULL);
if (version < ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION)
return;
/* /*
* Use EGL_EXT_image_dma_buf_import_modifiers to query and advertise * Use EGL_EXT_image_dma_buf_import_modifiers to query and advertise
* format/modifier codes. * format/modifier codes.
@@ -510,11 +508,18 @@ bind_linux_dmabuf(struct wl_client *client,
modifiers = &modifier_invalid; modifiers = &modifier_invalid;
} }
for (j = 0; j < num_modifiers; j++) { for (j = 0; j < num_modifiers; j++) {
uint32_t modifier_lo = modifiers[j] & 0xFFFFFFFF; if (version >= ZWP_LINUX_DMABUF_V1_MODIFIER_SINCE_VERSION) {
uint32_t modifier_hi = modifiers[j] >> 32; uint32_t modifier_lo = modifiers[j] & 0xFFFFFFFF;
zwp_linux_dmabuf_v1_send_modifier(resource, formats[i], uint32_t modifier_hi = modifiers[j] >> 32;
modifier_hi, zwp_linux_dmabuf_v1_send_modifier(resource,
modifier_lo); formats[i],
modifier_hi,
modifier_lo);
} else if (modifiers[j] == DRM_FORMAT_MOD_LINEAR ||
modifiers == &modifier_invalid) {
zwp_linux_dmabuf_v1_send_format(resource,
formats[i]);
}
} }
if (modifiers != &modifier_invalid) if (modifiers != &modifier_invalid)
free(modifiers); free(modifiers);
libweston/linux-dmabuf.h
+3
View File
@@ -32,6 +32,9 @@
#ifndef DRM_FORMAT_MOD_INVALID #ifndef DRM_FORMAT_MOD_INVALID
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1) #define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
#endif #endif
#ifndef DRM_FORMAT_MOD_LINEAR
#define DRM_FORMAT_MOD_LINEAR 0
#endif
struct linux_dmabuf_buffer; struct linux_dmabuf_buffer;
typedef void (*dmabuf_user_data_destroy_func)( typedef void (*dmabuf_user_data_destroy_func)(