Since they haven't been altered for the last 9-12 revisions, and in order to reduce the load of patches to rebase and carry, I just landed the EGL side (patches 1-7), with my r-b added on the couple patches I hadn't reviewed.
Cheers, Eric On Tuesday, 2017-05-30 17:23:40 +0530, Varad Gautam wrote: > From: Varad Gautam <varad.gau...@collabora.com> > > v2: check for DRIimageExtension version 15 (Jason Ekstrand) > > Signed-off-by: Varad Gautam <varad.gau...@collabora.com> > Reviewed-by: Daniel Stone <dani...@collabora.com> > Reviewed-by: Emil Velikov <emil.veli...@collabora.com> > --- > src/egl/drivers/dri2/egl_dri2.c | 6 ++++++ > src/egl/main/eglapi.c | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c > index bcafdf9..d31a0bf 100644 > --- a/src/egl/drivers/dri2/egl_dri2.c > +++ b/src/egl/drivers/dri2/egl_dri2.c > @@ -726,6 +726,12 @@ dri2_setup_screen(_EGLDisplay *disp) > dri2_dpy->image->createImageFromDmaBufs) { > disp->Extensions.EXT_image_dma_buf_import = EGL_TRUE; > } > + if (dri2_dpy->image->base.version >= 15 && > + dri2_dpy->image->createImageFromDmaBufs2 && > + dri2_dpy->image->queryDmaBufFormats && > + dri2_dpy->image->queryDmaBufModifiers) { > + disp->Extensions.EXT_image_dma_buf_import_modifiers = EGL_TRUE; > + } > #endif > } > } > diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c > index a4d5f89..e6355ac 100644 > --- a/src/egl/main/eglapi.c > +++ b/src/egl/main/eglapi.c > @@ -488,6 +488,7 @@ _eglCreateExtensionsString(_EGLDisplay *dpy) > _EGL_CHECK_EXTENSION(EXT_buffer_age); > _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_swap_buffers_with_damage); > > _EGL_CHECK_EXTENSION(KHR_cl_event2); > -- > 2.10.0 > _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev