<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Fri, May 19, 2017 at 2:37 AM, Daniel Stone <<a href="mailto:daniels@collabora.com" target="_blank">daniels@collabora.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Varad Gautam <<a href="mailto:varad.gautam@collabora.com">varad.gautam@collabora.com</a>> allow egl clients to query the dmabuf formats supported on this platform. v2: return EGLBoolean. v3: Check DRIimageExtension version before querying (Daniel Stone) Signed-off-by: Louis-Francis Ratté-Boulianne <<a href="mailto:lfrb@collabora.com">lfrb@collabora.com</a>> Signed-off-by: Varad Gautam <<a href="mailto:varad.gautam@collabora.com">varad.gautam@collabora.com</a>> Reviewed-by: Daniel Stone <<a href="mailto:daniels@collabora.com">daniels@collabora.com</a>> Signed-off-by: Daniel Stone <<a href="mailto:daniels@collabora.com">daniels@collabora.com</a>> --- src/egl/drivers/dri2/egl_dri2.c | 21 +++++++++++++++++++++ src/egl/main/eglapi.c | 18 ++++++++++++++++++ src/egl/main/eglapi.h | 4 ++++ src/egl/main/eglentrypoint.h | 1 + 4 files changed, 44 insertions(+) diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index f06b5535c7..55b6fcf1fc 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2111,6 +2111,26 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs) return plane_n; } +static EGLBoolean +dri2_query_dma_buf_formats(_EGLDriver *drv, _EGLDisplay *disp, + EGLint max, EGLint *formats, EGLint *count) +{ + struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); + if (max < 0 || (max > 0 && formats == NULL)) { + _eglError(EGL_BAD_PARAMETER, "invalid value for max count of formats"); + return EGL_FALSE; + } + + if (dri2_dpy->image->base.version < 16) </blockquote><div> </div><div>I think you need to also check for the existance of the function pointer. </div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> + return EGL_FALSE; + + if (!dri2_dpy->image->queryDmaBufFormats(dri2_dpy->dri_screen, max, + formats, count)) + return EGL_FALSE; + + return EGL_TRUE; +} + /** * The spec says: * @@ -3043,6 +3063,7 @@ _eglBuiltInDriverDRI2(const char *args) dri2_drv->base.API.ExportDRMImageMESA = dri2_export_drm_image_mesa; dri2_drv->base.API.ExportDMABUFImageQueryMESA = dri2_export_dma_buf_image_query_mesa; dri2_drv->base.API.ExportDMABUFImageMESA = dri2_export_dma_buf_image_mesa; + dri2_drv->base.API.QueryDmaBufFormatsEXT = dri2_query_dma_buf_formats; #endif #ifdef HAVE_WAYLAND_PLATFORM dri2_drv->base.API.BindWaylandDisplayWL = dri2_bind_wayland_display_wl; diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index 9cea2f41ff..e83e3a414e 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -2385,6 +2385,24 @@ _eglFunctionCompare(const void *key, const void *elem) return strcmp(procname, entrypoint->name); } +static EGLBoolean EGLAPIENTRY +eglQueryDmaBufFormatsEXT(EGLDisplay dpy, EGLint max_formats, + EGLint *formats, EGLint *num_formats) +{ + _EGLDisplay *disp = _eglLockDisplay(dpy); + _EGLDriver *drv; + EGLBoolean ret; + + _EGL_FUNC_START(NULL, EGL_NONE, NULL, EGL_FALSE); + + _EGL_CHECK_DISPLAY(disp, EGL_FALSE, drv); + + ret = drv->API.QueryDmaBufFormatsEXT(drv, disp, max_formats, formats, + num_formats); + + RETURN_EGL_EVAL(disp, ret); +} + __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname) { diff --git a/src/egl/main/eglapi.h b/src/egl/main/eglapi.h index 710c5d860a..c9f98963db 100644 --- a/src/egl/main/eglapi.h +++ b/src/egl/main/eglapi.h @@ -198,6 +198,10 @@ struct _egl_api int (*GLInteropExportObject)(_EGLDisplay *dpy, _EGLContext *ctx, struct mesa_glinterop_export_in *in, struct mesa_glinterop_export_out *out); + + EGLBoolean (*QueryDmaBufFormatsEXT)(_EGLDriver *drv, _EGLDisplay *dpy, + EGLint max_formats, EGLint *formats, + EGLint *num_formats); }; #ifdef __cplusplus diff --git a/src/egl/main/eglentrypoint.h b/src/egl/main/eglentrypoint.h index e6318b9311..91536239e9 100644 --- a/src/egl/main/eglentrypoint.h +++ b/src/egl/main/eglentrypoint.h @@ -56,6 +56,7 @@ EGL_ENTRYPOINT(eglPostSubBufferNV) EGL_ENTRYPOINT(eglQueryAPI) EGL_ENTRYPOINT(eglQueryContext) EGL_ENTRYPOINT(eglQueryDebugKHR) +EGL_ENTRYPOINT(eglQueryDmaBufFormatsEXT) EGL_ENTRYPOINT(eglQueryString) EGL_ENTRYPOINT(eglQuerySurface) EGL_ENTRYPOINT(eglQueryWaylandBufferWL) -- 2.13.0 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div></div>