[Mesa-dev] [PATCH 1/3] egl: implement EXT_surface_SMPTE2086_metadata and EXT_surface_CTA861_3_metadata
Tapani Pälli
tapani.palli at intel.com
Mon Apr 30 06:42:36 UTC 2018
Patch implements common bits for EXT_surface_SMPTE2086_metadata
and EXT_surface_CTA861_3_metadata extensions by adding new required
attributes and eglQuerySurface + eglSurfaceAttrib changes.
Currently none of the drivers are utilizing this data but this patch
is enabler in getting there.
Following dEQP cases pass with these changes:
dEQP-EGL.functional.hdr_metadata.smpte2086
dEQP-EGL.functional.hdr_metadata.cta861_3
Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
src/egl/drivers/dri2/egl_dri2.c | 3 +
src/egl/main/eglapi.c | 2 +
src/egl/main/egldisplay.h | 2 +
src/egl/main/eglsurface.c | 169 ++++++++++++++++++++++++++++++++++++++++
src/egl/main/eglsurface.h | 19 +++++
5 files changed, 195 insertions(+)
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 45d0c7275c..fcfd3852d9 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -712,6 +712,9 @@ dri2_setup_screen(_EGLDisplay *disp)
disp->Extensions.EXT_create_context_robustness = EGL_TRUE;
}
+ disp->Extensions.EXT_surface_SMPTE2086_metadata = EGL_TRUE;
+ disp->Extensions.EXT_surface_CTA861_3_metadata = EGL_TRUE;
+
if (dri2_dpy->no_error)
disp->Extensions.KHR_create_context_no_error = EGL_TRUE;
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index c110349119..493fd6d1b9 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -488,6 +488,8 @@ _eglCreateExtensionsString(_EGLDisplay *dpy)
_EGL_CHECK_EXTENSION(EXT_create_context_robustness);
_EGL_CHECK_EXTENSION(EXT_image_dma_buf_import);
_EGL_CHECK_EXTENSION(EXT_image_dma_buf_import_modifiers);
+ _EGL_CHECK_EXTENSION(EXT_surface_CTA861_3_metadata);
+ _EGL_CHECK_EXTENSION(EXT_surface_SMPTE2086_metadata);
_EGL_CHECK_EXTENSION(EXT_swap_buffers_with_damage);
_EGL_CHECK_EXTENSION(IMG_context_priority);
diff --git a/src/egl/main/egldisplay.h b/src/egl/main/egldisplay.h
index d7e51991a4..6dc77ebe3d 100644
--- a/src/egl/main/egldisplay.h
+++ b/src/egl/main/egldisplay.h
@@ -105,6 +105,8 @@ struct _egl_extensions
EGLBoolean EXT_image_dma_buf_import;
EGLBoolean EXT_image_dma_buf_import_modifiers;
EGLBoolean EXT_pixel_format_float;
+ EGLBoolean EXT_surface_CTA861_3_metadata;
+ EGLBoolean EXT_surface_SMPTE2086_metadata;
EGLBoolean EXT_swap_buffers_with_damage;
unsigned int IMG_context_priority;
diff --git a/src/egl/main/eglsurface.c b/src/egl/main/eglsurface.c
index 3bd14a8cd0..1bf4723243 100644
--- a/src/egl/main/eglsurface.c
+++ b/src/egl/main/eglsurface.c
@@ -86,6 +86,90 @@ _eglParseSurfaceAttribList(_EGLSurface *surf, const EGLint *attrib_list)
break;
surf->GLColorspace = val;
break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.display_primary_r.x = val;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.display_primary_r.y = val;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.display_primary_g.x = val;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.display_primary_g.y = val;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.display_primary_b.x = val;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.display_primary_b.y = val;
+ break;
+ case EGL_SMPTE2086_WHITE_POINT_X_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.white_point.x = val;
+ break;
+ case EGL_SMPTE2086_WHITE_POINT_Y_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.white_point.y = val;
+ break;
+ case EGL_SMPTE2086_MAX_LUMINANCE_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.max_luminance = val;
+ break;
+ case EGL_SMPTE2086_MIN_LUMINANCE_EXT:
+ if (!dpy->Extensions.EXT_surface_SMPTE2086_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.min_luminance = val;
+ break;
+ case EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT:
+ if (!dpy->Extensions.EXT_surface_CTA861_3_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.max_cll = val;
+ break;
+ case EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT:
+ if (!dpy->Extensions.EXT_surface_CTA861_3_metadata) {
+ err = EGL_BAD_ATTRIBUTE;
+ break;
+ }
+ surf->HdrMetadata.max_fall = val;
+ break;
case EGL_VG_COLORSPACE:
switch (val) {
case EGL_VG_COLORSPACE_sRGB:
@@ -305,6 +389,19 @@ _eglInitSurface(_EGLSurface *surf, _EGLDisplay *dpy, EGLint type,
/* the default swap interval is 1 */
surf->SwapInterval = 1;
+ surf->HdrMetadata.display_primary_r.x = EGL_DONT_CARE;
+ surf->HdrMetadata.display_primary_r.y = EGL_DONT_CARE;
+ surf->HdrMetadata.display_primary_g.x = EGL_DONT_CARE;
+ surf->HdrMetadata.display_primary_g.y = EGL_DONT_CARE;
+ surf->HdrMetadata.display_primary_b.x = EGL_DONT_CARE;
+ surf->HdrMetadata.display_primary_b.y = EGL_DONT_CARE;
+ surf->HdrMetadata.white_point.x = EGL_DONT_CARE;
+ surf->HdrMetadata.white_point.y = EGL_DONT_CARE;
+ surf->HdrMetadata.max_luminance = EGL_DONT_CARE;
+ surf->HdrMetadata.min_luminance = EGL_DONT_CARE;
+ surf->HdrMetadata.max_cll = EGL_DONT_CARE;
+ surf->HdrMetadata.max_fall = EGL_DONT_CARE;
+
err = _eglParseSurfaceAttribList(surf, attrib_list);
if (err != EGL_SUCCESS)
return _eglError(err, func);
@@ -403,6 +500,42 @@ _eglQuerySurface(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surface,
*value = result;
surface->BufferAgeRead = EGL_TRUE;
break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT:
+ *value = surface->HdrMetadata.display_primary_r.x;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT:
+ *value = surface->HdrMetadata.display_primary_r.y;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT:
+ *value = surface->HdrMetadata.display_primary_g.x;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT:
+ *value = surface->HdrMetadata.display_primary_g.y;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT:
+ *value = surface->HdrMetadata.display_primary_b.x;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT:
+ *value = surface->HdrMetadata.display_primary_b.y;
+ break;
+ case EGL_SMPTE2086_WHITE_POINT_X_EXT:
+ *value = surface->HdrMetadata.white_point.x;
+ break;
+ case EGL_SMPTE2086_WHITE_POINT_Y_EXT:
+ *value = surface->HdrMetadata.white_point.y;
+ break;
+ case EGL_SMPTE2086_MAX_LUMINANCE_EXT:
+ *value = surface->HdrMetadata.max_luminance;
+ break;
+ case EGL_SMPTE2086_MIN_LUMINANCE_EXT:
+ *value = surface->HdrMetadata.min_luminance;
+ break;
+ case EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT:
+ *value = surface->HdrMetadata.max_cll;
+ break;
+ case EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT:
+ *value = surface->HdrMetadata.max_fall;
+ break;
default:
return _eglError(EGL_BAD_ATTRIBUTE, "eglQuerySurface");
}
@@ -467,6 +600,42 @@ _eglSurfaceAttrib(_EGLDriver *drv, _EGLDisplay *dpy, _EGLSurface *surface,
break;
surface->SwapBehavior = value;
break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_RX_EXT:
+ surface->HdrMetadata.display_primary_r.x = value;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_RY_EXT:
+ surface->HdrMetadata.display_primary_r.y = value;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_GX_EXT:
+ surface->HdrMetadata.display_primary_g.x = value;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_GY_EXT:
+ surface->HdrMetadata.display_primary_g.y = value;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_BX_EXT:
+ surface->HdrMetadata.display_primary_b.x = value;
+ break;
+ case EGL_SMPTE2086_DISPLAY_PRIMARY_BY_EXT:
+ surface->HdrMetadata.display_primary_b.y = value;
+ break;
+ case EGL_SMPTE2086_WHITE_POINT_X_EXT:
+ surface->HdrMetadata.white_point.x = value;
+ break;
+ case EGL_SMPTE2086_WHITE_POINT_Y_EXT:
+ surface->HdrMetadata.white_point.y = value;
+ break;
+ case EGL_SMPTE2086_MAX_LUMINANCE_EXT:
+ surface->HdrMetadata.max_luminance = value;
+ break;
+ case EGL_SMPTE2086_MIN_LUMINANCE_EXT:
+ surface->HdrMetadata.min_luminance = value;
+ break;
+ case EGL_CTA861_3_MAX_CONTENT_LIGHT_LEVEL_EXT:
+ surface->HdrMetadata.max_cll = value;
+ break;
+ case EGL_CTA861_3_MAX_FRAME_AVERAGE_LEVEL_EXT:
+ surface->HdrMetadata.max_fall = value;
+ break;
default:
err = EGL_BAD_ATTRIBUTE;
break;
diff --git a/src/egl/main/eglsurface.h b/src/egl/main/eglsurface.h
index c53e8d0067..2375c8a0e7 100644
--- a/src/egl/main/eglsurface.h
+++ b/src/egl/main/eglsurface.h
@@ -41,6 +41,23 @@
extern "C" {
#endif
+struct _egl_xyy
+{
+ uint16_t x, y;
+};
+
+struct _egl_hdr_metadata
+{
+ struct _egl_xyy display_primary_r;
+ struct _egl_xyy display_primary_g;
+ struct _egl_xyy display_primary_b;
+ struct _egl_xyy white_point;
+ uint16_t max_luminance;
+ uint16_t min_luminance;
+ uint16_t max_cll;
+ uint16_t max_fall;
+};
+
/**
* "Base" class for device driver surfaces.
*/
@@ -98,6 +115,8 @@ struct _egl_surface
EGLBoolean BoundToTexture;
EGLBoolean PostSubBufferSupportedNV;
+
+ struct _egl_hdr_metadata HdrMetadata;
};
--
2.13.6
More information about the mesa-dev
mailing list