From f7da8b3139ad609d7ab75f3652f658e4dd4574ac Mon Sep 17 00:00:00 2001 From: Varad Gautam Date: Wed, 23 Nov 2016 14:03:18 +0530 Subject: [PATCH] gl-renderer: allow importing dmabufs with format modifiers pass over the modifier attributes to EGL. v2: ensure same modifier is passed for all planes (Daniel Stone) Signed-off-by: Varad Gautam Reviewed-by: Daniel Stone --- libweston/gl-renderer.c | 29 ++++++++++++++++++++++++++--- shared/weston-egl-ext.h | 6 ++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c index 9e56a200..f5e5371e 100644 --- a/libweston/gl-renderer.c +++ b/libweston/gl-renderer.c @@ -1577,7 +1577,7 @@ import_simple_dmabuf(struct gl_renderer *gr, struct dmabuf_attributes *attributes) { struct egl_image *image; - EGLint attribs[30]; + EGLint attribs[40]; int atti = 0; /* This requires the Mesa commit in @@ -1594,7 +1594,6 @@ import_simple_dmabuf(struct gl_renderer *gr, attribs[atti++] = attributes->height; attribs[atti++] = EGL_LINUX_DRM_FOURCC_EXT; attribs[atti++] = attributes->format; - /* XXX: Add modifier here when supported */ if (attributes->n_planes > 0) { attribs[atti++] = EGL_DMA_BUF_PLANE0_FD_EXT; @@ -1603,6 +1602,12 @@ import_simple_dmabuf(struct gl_renderer *gr, attribs[atti++] = attributes->offset[0]; attribs[atti++] = EGL_DMA_BUF_PLANE0_PITCH_EXT; attribs[atti++] = attributes->stride[0]; + if (gr->has_dmabuf_import_modifiers) { + attribs[atti++] = EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT; + attribs[atti++] = attributes->modifier[0] & 0xFFFFFFFF; + attribs[atti++] = EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT; + attribs[atti++] = attributes->modifier[0] >> 32; + } } if (attributes->n_planes > 1) { @@ -1612,6 +1617,12 @@ import_simple_dmabuf(struct gl_renderer *gr, attribs[atti++] = attributes->offset[1]; attribs[atti++] = EGL_DMA_BUF_PLANE1_PITCH_EXT; attribs[atti++] = attributes->stride[1]; + if (gr->has_dmabuf_import_modifiers) { + attribs[atti++] = EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT; + attribs[atti++] = attributes->modifier[1] & 0xFFFFFFFF; + attribs[atti++] = EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT; + attribs[atti++] = attributes->modifier[1] >> 32; + } } if (attributes->n_planes > 2) { @@ -1621,6 +1632,12 @@ import_simple_dmabuf(struct gl_renderer *gr, attribs[atti++] = attributes->offset[2]; attribs[atti++] = EGL_DMA_BUF_PLANE2_PITCH_EXT; attribs[atti++] = attributes->stride[2]; + if (gr->has_dmabuf_import_modifiers) { + attribs[atti++] = EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT; + attribs[atti++] = attributes->modifier[2] & 0xFFFFFFFF; + attribs[atti++] = EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT; + attribs[atti++] = attributes->modifier[2] >> 32; + } } attribs[atti++] = EGL_NONE; @@ -1944,8 +1961,14 @@ gl_renderer_import_dmabuf(struct weston_compositor *ec, assert(gr->has_dmabuf_import); for (i = 0; i < dmabuf->attributes.n_planes; i++) { - /* EGL import does not have modifiers */ + /* return if EGL doesn't support import modifiers */ if (dmabuf->attributes.modifier[i] != 0) + if (!gr->has_dmabuf_import_modifiers) + return false; + + /* return if modifiers passed are unequal */ + if (dmabuf->attributes.modifier[i] != + dmabuf->attributes.modifier[0]) return false; } diff --git a/shared/weston-egl-ext.h b/shared/weston-egl-ext.h index c7a34302..05eca317 100644 --- a/shared/weston-egl-ext.h +++ b/shared/weston-egl-ext.h @@ -128,6 +128,12 @@ typedef struct wl_buffer * (EGLAPIENTRYP PFNEGLCREATEWAYLANDBUFFERFROMIMAGEWL) ( /* Define tokens from EGL_EXT_image_dma_buf_import_modifiers */ #ifndef EGL_EXT_image_dma_buf_import_modifiers #define EGL_EXT_image_dma_buf_import_modifiers 1 +#define EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT 0x3443 +#define EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT 0x3444 +#define EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT 0x3445 +#define EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT 0x3446 +#define EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT 0x3447 +#define EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT 0x3448 typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFFORMATSEXTPROC) (EGLDisplay dpy, EGLint max_formats, EGLint *formats, EGLint *num_formats); typedef EGLBoolean (EGLAPIENTRYP PFNEGLQUERYDMABUFMODIFIERSEXTPROC) (EGLDisplay dpy, EGLint format, EGLint max_modifiers, EGLuint64KHR *modifiers, EGLBoolean *external_only, EGLint *num_modifiers); #endif