OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egl/main: add support for fourth plane tokens

Browse Source 
The EGL_EXT_dma_buf_import_modifiers extension adds support for a
fourth plane, just like DRM KMS API does.

Bump maximum dma_buf plane count to four.

v2: prevent attribute tokens from being parsed if
    EXT_image_dma_buf_import_modifiers is not suported. (Emil Velikov)

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Varad Gautam <varad.gautam@collabora.com>
Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Pekka Paalanen
2017-05-30 17:23:35 +05:30
committed by Eric Engestrom
parent 9434f057c8
commit fb2a1c2327
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/egl/drivers/dri2/egl_dri2.c
View File

@@ -2090,7 +2090,7 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs)
* "If <target> is EGL_LINUX_DMA_BUF_EXT, and the EGL_LINUX_DRM_FOURCC_EXT * "If <target> is EGL_LINUX_DMA_BUF_EXT, and the EGL_LINUX_DRM_FOURCC_EXT
* attribute indicates a single-plane format, EGL_BAD_ATTRIBUTE is * attribute indicates a single-plane format, EGL_BAD_ATTRIBUTE is
* generated if any of the EGL_DMA_BUF_PLANE1_* or EGL_DMA_BUF_PLANE2_* * generated if any of the EGL_DMA_BUF_PLANE1_* or EGL_DMA_BUF_PLANE2_*
* attributes are specified." * or EGL_DMA_BUF_PLANE3_* attributes are specified."
*/ */
for (i = plane_n; i < DMA_BUF_MAX_PLANES; ++i) { for (i = plane_n; i < DMA_BUF_MAX_PLANES; ++i) {
if (attrs->DMABufPlaneFds[i].IsPresent || if (attrs->DMABufPlaneFds[i].IsPresent ||

1
src/egl/main/egldisplay.h
View File

@@ -102,6 +102,7 @@ struct _egl_extensions
EGLBoolean EXT_buffer_age; EGLBoolean EXT_buffer_age;
EGLBoolean EXT_create_context_robustness; EGLBoolean EXT_create_context_robustness;
EGLBoolean EXT_image_dma_buf_import; EGLBoolean EXT_image_dma_buf_import;
EGLBoolean EXT_image_dma_buf_import_modifiers;
EGLBoolean EXT_swap_buffers_with_damage; EGLBoolean EXT_swap_buffers_with_damage;
EGLBoolean KHR_cl_event2; EGLBoolean KHR_cl_event2;

18
src/egl/main/eglimage.c
View File

@@ -130,6 +130,24 @@ _eglParseImageAttribList(_EGLImageAttribs *attrs, _EGLDisplay *dpy,
attrs->DMABufPlanePitches[2].Value = val; attrs->DMABufPlanePitches[2].Value = val;
attrs->DMABufPlanePitches[2].IsPresent = EGL_TRUE; attrs->DMABufPlanePitches[2].IsPresent = EGL_TRUE;
break; break;
case EGL_DMA_BUF_PLANE3_FD_EXT:
if (!dpy->Extensions.EXT_image_dma_buf_import_modifiers)
err = EGL_BAD_PARAMETER;
attrs->DMABufPlaneFds[3].Value = val;
attrs->DMABufPlaneFds[3].IsPresent = EGL_TRUE;
break;
case EGL_DMA_BUF_PLANE3_OFFSET_EXT:
if (!dpy->Extensions.EXT_image_dma_buf_import_modifiers)
err = EGL_BAD_PARAMETER;
attrs->DMABufPlaneOffsets[3].Value = val;
attrs->DMABufPlaneOffsets[3].IsPresent = EGL_TRUE;
break;
case EGL_DMA_BUF_PLANE3_PITCH_EXT:
if (!dpy->Extensions.EXT_image_dma_buf_import_modifiers)
err = EGL_BAD_PARAMETER;
attrs->DMABufPlanePitches[3].Value = val;
attrs->DMABufPlanePitches[3].IsPresent = EGL_TRUE;
break;
case EGL_YUV_COLOR_SPACE_HINT_EXT: case EGL_YUV_COLOR_SPACE_HINT_EXT:
if (val != EGL_ITU_REC601_EXT && val != EGL_ITU_REC709_EXT && if (val != EGL_ITU_REC601_EXT && val != EGL_ITU_REC709_EXT &&
val != EGL_ITU_REC2020_EXT) { val != EGL_ITU_REC2020_EXT) {

5
src/egl/main/eglimage.h
View File

@@ -46,7 +46,7 @@ struct _egl_image_attrib_int
EGLBoolean IsPresent; EGLBoolean IsPresent;
}; };
#define DMA_BUF_MAX_PLANES 3 #define DMA_BUF_MAX_PLANES 4
struct _egl_image_attribs struct _egl_image_attribs
{ {
@@ -67,7 +67,8 @@ struct _egl_image_attribs
/* EGL_WL_bind_wayland_display */ /* EGL_WL_bind_wayland_display */
EGLint PlaneWL; EGLint PlaneWL;
/* EGL_EXT_image_dma_buf_import */ /* EGL_EXT_image_dma_buf_import and
* EGL_EXT_image_dma_buf_import_modifiers */
struct _egl_image_attrib_int DMABufFourCC; struct _egl_image_attrib_int DMABufFourCC;
struct _egl_image_attrib_int DMABufPlaneFds[DMA_BUF_MAX_PLANES]; struct _egl_image_attrib_int DMABufPlaneFds[DMA_BUF_MAX_PLANES];
struct _egl_image_attrib_int DMABufPlaneOffsets[DMA_BUF_MAX_PLANES]; struct _egl_image_attrib_int DMABufPlaneOffsets[DMA_BUF_MAX_PLANES];