On 09/16/2015 05:00 PM, Dave Airlie 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 <airl...@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 },
I saw this patch, and I thought there was a reason it was necessary. I did a bit of GIT history searching, and I couldn't find anything... so I didn't object. To prevent this happening again, we should change the comment from a FIXME to actually document the external requirement. > { "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 }, _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev