[Mesa-dev] [v4 09/10] egl: definitions for EXT_image_dma_buf_import
Chad Versace
chad.versace at linux.intel.com
Thu May 23 21:40:09 PDT 2013
On 05/02/2013 12:08 AM, Topi Pohjolainen wrote:
> As specified in:
>
> http://www.khronos.org/registry/egl/extensions/EXT/EGL_EXT_image_dma_buf_import.txt
>
> Checking for the valid fourcc values is left for drivers avoiding
> dependency to drm header files here.
>
> v2:
> - enforce EGL_NO_CONTEXT
>
> v3:
> - declare the extension as EGL (not GLES)
>
> v4:
> - do not update eglext.h manually but rely on update from
> Khronos instead
>
> Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
> ---
> src/egl/main/eglapi.c | 7 ++++-
> src/egl/main/egldisplay.h | 1 +
> src/egl/main/eglimage.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++
> src/egl/main/eglimage.h | 15 ++++++++++
> src/egl/main/eglmisc.c | 1 +
> 5 files changed, 99 insertions(+), 1 deletion(-)
>
> diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
> index bcc5465..2355d45 100644
> --- a/src/egl/main/eglapi.c
> +++ b/src/egl/main/eglapi.c
> @@ -1310,7 +1310,12 @@ eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target,
> _EGL_CHECK_DISPLAY(disp, EGL_NO_IMAGE_KHR, drv);
> if (!disp->Extensions.KHR_image_base)
> RETURN_EGL_EVAL(disp, EGL_NO_IMAGE_KHR);
> - if (!context && ctx != EGL_NO_CONTEXT)
> +
> + /**
> + * "If <target> is EGL_LINUX_DMA_BUF_EXT, <dpy> must be a valid display,
> + * <ctx> must be EGL_NO_CONTEXT..."
> + */
> + if (ctx != EGL_NO_CONTEXT && (!context || target == EGL_LINUX_DMA_BUF_EXT))
> RETURN_EGL_ERROR(disp, EGL_BAD_CONTEXT, EGL_NO_IMAGE_KHR);
>
> img = drv->API.CreateImageKHR(drv,
> diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
> index 4b33470..5a21f78 100644
> --- a/src/egl/main/egldisplay.h
> +++ b/src/egl/main/egldisplay.h
> @@ -115,6 +115,7 @@ struct _egl_extensions
>
> EGLBoolean EXT_create_context_robustness;
> EGLBoolean EXT_buffer_age;
> + EGLBoolean EXT_image_dma_buf_import;
> };
>
>
> diff --git a/src/egl/main/eglimage.c b/src/egl/main/eglimage.c
> index bfae709..1cede31 100644
> --- a/src/egl/main/eglimage.c
> +++ b/src/egl/main/eglimage.c
> @@ -93,6 +93,82 @@ _eglParseImageAttribList(_EGLImageAttribs *attrs, _EGLDisplay *dpy,
> attrs->PlaneWL = val;
> break;
>
> + case EGL_LINUX_DRM_FOURCC_EXT:
> + attrs->DMABufFourCC.Value = val;
> + attrs->DMABufFourCC.IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE0_FD_EXT:
> + attrs->DMABufPlaneFds[0].Value = val;
> + attrs->DMABufPlaneFds[0].IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE0_OFFSET_EXT:
> + attrs->DMABufPlaneOffsets[0].Value = val;
> + attrs->DMABufPlaneOffsets[0].IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE0_PITCH_EXT:
> + attrs->DMABufPlanePitches[0].Value = val;
> + attrs->DMABufPlanePitches[0].IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE1_FD_EXT:
> + attrs->DMABufPlaneFds[1].Value = val;
> + attrs->DMABufPlaneFds[1].IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE1_OFFSET_EXT:
> + attrs->DMABufPlaneOffsets[1].Value = val;
> + attrs->DMABufPlaneOffsets[1].IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE1_PITCH_EXT:
> + attrs->DMABufPlanePitches[1].Value = val;
> + attrs->DMABufPlanePitches[1].IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE2_FD_EXT:
> + attrs->DMABufPlaneFds[2].Value = val;
> + attrs->DMABufPlaneFds[2].IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE2_OFFSET_EXT:
> + attrs->DMABufPlaneOffsets[2].Value = val;
> + attrs->DMABufPlaneOffsets[2].IsPresent = EGL_TRUE;
> + break;
> + case EGL_DMA_BUF_PLANE2_PITCH_EXT:
> + attrs->DMABufPlanePitches[2].Value = val;
> + attrs->DMABufPlanePitches[2].IsPresent = EGL_TRUE;
> + break;
> + case EGL_YUV_COLOR_SPACE_HINT_EXT:
> + if (val != EGL_ITU_REC601_EXT || val != EGL_ITU_REC709_EXT ||
> + val != EGL_ITU_REC2020_EXT) {
This should be `val != X && val != Y && val != Z`.
> + err = EGL_BAD_ATTRIBUTE;
> + } else {
> + attrs->DMABufYuvColorSpaceHint.Value = val;
> + attrs->DMABufYuvColorSpaceHint.IsPresent = EGL_TRUE;
> + }
> + break;
> + case EGL_SAMPLE_RANGE_HINT_EXT:
> + if (val != EGL_YUV_FULL_RANGE_EXT || val != EGL_YUV_NARROW_RANGE_EXT) {
> + err = EGL_BAD_ATTRIBUTE;
Again, s/||/&&/. Also, there is a tab above, but all the surrounding code uses spaces.
> + } else {
> + attrs->DMABufSampleRangeHint.Value = val;
> + attrs->DMABufSampleRangeHint.IsPresent = EGL_TRUE;
> + }
> + break;
> + case EGL_YUV_CHROMA_HORIZONTAL_SITING_HINT_EXT:
> + if (val != EGL_YUV_CHROMA_SITING_0_EXT ||
> + val != EGL_YUV_CHROMA_SITING_0_5_EXT) {
> + err = EGL_BAD_ATTRIBUTE;
Again, s/||/&&/ and a tab.
> + } else {
> + attrs->DMABufChromaHorizontalSiting.Value = val;
> + attrs->DMABufChromaHorizontalSiting.IsPresent = EGL_TRUE;
> + }
> + break;
> + case EGL_YUV_CHROMA_VERTICAL_SITING_HINT_EXT:
> + if (val != EGL_YUV_CHROMA_SITING_0_EXT ||
> + val != EGL_YUV_CHROMA_SITING_0_5_EXT) {
> + err = EGL_BAD_ATTRIBUTE;
Again, s/||/&&/ and a tab.
> + } else {
> + attrs->DMABufChromaVerticalSiting.Value = val;
> + attrs->DMABufChromaVerticalSiting.IsPresent = EGL_TRUE;
> + }
> + break;
> +
> default:
> /* unknown attrs are ignored */
> break;
> diff --git a/src/egl/main/eglimage.h b/src/egl/main/eglimage.h
> index 9cc86d5..1b4d6cd 100644
> --- a/src/egl/main/eglimage.h
> +++ b/src/egl/main/eglimage.h
> @@ -34,6 +34,11 @@
> #include "egltypedefs.h"
> #include "egldisplay.h"
>
> +struct _egl_image_attrib_int
> +{
> + EGLint Value;
> + EGLBoolean IsPresent;
> +};
>
> struct _egl_image_attribs
> {
> @@ -53,6 +58,16 @@ struct _egl_image_attribs
>
> /* EGL_WL_bind_wayland_display */
> EGLint PlaneWL;
> +
> + /* EGL_EXT_image_dma_buf_import */
> + struct _egl_image_attrib_int DMABufFourCC;
> + struct _egl_image_attrib_int DMABufPlaneFds[3];
> + struct _egl_image_attrib_int DMABufPlaneOffsets[3];
> + struct _egl_image_attrib_int DMABufPlanePitches[3];
> + struct _egl_image_attrib_int DMABufYuvColorSpaceHint;
> + struct _egl_image_attrib_int DMABufSampleRangeHint;
> + struct _egl_image_attrib_int DMABufChromaHorizontalSiting;
> + struct _egl_image_attrib_int DMABufChromaVerticalSiting;
> };
>
> /**
> diff --git a/src/egl/main/eglmisc.c b/src/egl/main/eglmisc.c
> index 92b0eae..f1509b3 100644
> --- a/src/egl/main/eglmisc.c
> +++ b/src/egl/main/eglmisc.c
> @@ -117,6 +117,7 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy)
>
> _EGL_CHECK_EXTENSION(EXT_create_context_robustness);
> _EGL_CHECK_EXTENSION(EXT_buffer_age);
> + _EGL_CHECK_EXTENSION(EXT_image_dma_buf_import);
>
> _EGL_CHECK_EXTENSION(NV_post_sub_buffer);
> #undef _EGL_CHECK_EXTENSION
>
More information about the mesa-dev
mailing list