[Mesa-dev] [v6 8/9] egl: definitions for EXT_image_dma_buf_import
Topi Pohjolainen
topi.pohjolainen at intel.com
Tue May 28 02:17:51 PDT 2013
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
v5: report invalid context as EGL_BAD_PARAMETER instead of as
EGL_BAD_CONTEXT (Eric)
v6: fix the checking for valid hints. Before all values were
rejected (Chad).
Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
src/egl/main/eglapi.c | 6 ++++
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(+)
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index 4a9831b..5b15744 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -1344,6 +1344,12 @@ eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target,
RETURN_EGL_EVAL(disp, EGL_NO_IMAGE_KHR);
if (!context && ctx != EGL_NO_CONTEXT)
RETURN_EGL_ERROR(disp, EGL_BAD_CONTEXT, EGL_NO_IMAGE_KHR);
+ /**
+ * "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 && target == EGL_LINUX_DMA_BUF_EXT)
+ RETURN_EGL_ERROR(disp, EGL_BAD_PARAMETER, EGL_NO_IMAGE_KHR);
img = drv->API.CreateImageKHR(drv,
disp, context, target, buffer, attr_list);
diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index f990300..fefd19c 100644
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -116,6 +116,7 @@ struct _egl_extensions
EGLBoolean EXT_create_context_robustness;
EGLBoolean EXT_buffer_age;
EGLBoolean EXT_swap_buffers_with_damage;
+ EGLBoolean EXT_image_dma_buf_import;
};
diff --git a/src/egl/main/eglimage.c b/src/egl/main/eglimage.c
index bfae709..818b597 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) {
+ 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;
+ } 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;
+ } 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;
+ } 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 a843ce7..2decc1b 100644
--- a/src/egl/main/eglmisc.c
+++ b/src/egl/main/eglmisc.c
@@ -118,6 +118,7 @@ _eglUpdateExtensionsString(_EGLDisplay *dpy)
_EGL_CHECK_EXTENSION(EXT_create_context_robustness);
_EGL_CHECK_EXTENSION(EXT_buffer_age);
_EGL_CHECK_EXTENSION(EXT_swap_buffers_with_damage);
+ _EGL_CHECK_EXTENSION(EXT_image_dma_buf_import);
_EGL_CHECK_EXTENSION(NV_post_sub_buffer);
#undef _EGL_CHECK_EXTENSION
--
1.8.1.2
More information about the mesa-dev
mailing list