[Mesa-dev] [PATCH] Revert "mesa/extensions: restrict GL_OES_EGL_image to GLES"

[Marek Olšák]

Thanks for reverting this.

The extension is required for importing dmabuf as textures in desktop
GL, so it can't removed no matter what the spec says.

Marek

On Wed, Sep 16, 2015 at 5:00 PM, Dave Airlie <airlied at gmail.com> wrote:
> This reverts commit 48961fa3ba37999a6f8fd812458b735e39604a95.
>
> glamor/Xwayland use this, the spec saying something when it
> was written, and the fact that the comment says Mesa relies on it
> hasn't changed.
>
> I also don't have a copy of this patch in my mail archive, which
> seems wierd, did it get posted to mesa-dev?
>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/mesa/main/extensions.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
> index 767c50e..b2c88c3 100644
> --- a/src/mesa/main/extensions.c
> +++ b/src/mesa/main/extensions.c
> @@ -307,7 +307,8 @@ static const struct extension extension_table[] = {
>     { "GL_OES_depth_texture_cube_map",              o(OES_depth_texture_cube_map),                         ES2, 2012 },
>     { "GL_OES_draw_texture",                        o(OES_draw_texture),                             ES1,       2004 },
>     { "GL_OES_EGL_sync",                            o(dummy_true),                                   ES1 | ES2, 2010 },
> -   { "GL_OES_EGL_image",                           o(OES_EGL_image),                                ES1 | ES2, 2006 },
> +   /*  FIXME: Mesa expects GL_OES_EGL_image to be available in OpenGL contexts. */
> +   { "GL_OES_EGL_image",                           o(OES_EGL_image),                           GL | ES1 | ES2, 2006 },
>     { "GL_OES_EGL_image_external",                  o(OES_EGL_image_external),                       ES1 | ES2, 2010 },
>     { "GL_OES_element_index_uint",                  o(dummy_true),                                   ES1 | ES2, 2005 },
>     { "GL_OES_fbo_render_mipmap",                   o(dummy_true),                                   ES1 | ES2, 2005 },
> --
> 2.4.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev