diff options
author | Dave Airlie <[email protected]> | 2015-09-17 06:55:31 +1000 |
---|---|---|
committer | Dave Airlie <[email protected]> | 2015-09-17 06:58:51 +1000 |
commit | b5df52b1128049bf688cace6e581a16d5f1ad5bb (patch) | |
tree | dbc3bac4704cd25a96360d956b5ee6b272428d77 | |
parent | f5b26b47444bac7334a3351d1f08d83d4545869c (diff) |
Revert "mesa/extensions: restrict GL_OES_EGL_image to GLES"
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 <[email protected]>
-rw-r--r-- | src/mesa/main/extensions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index 767c50e28c0..b2c88c37366 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 }, |