diff options
| author | Oliver McFadden <[email protected]> | 2012-09-11 10:23:20 +0300 |
|---|---|---|
| committer | Oliver McFadden <[email protected]> | 2012-09-15 12:57:20 +0300 |
| commit | f88393afbe93898b167b3f218bbf33cffc70ef38 (patch) | |
| tree | 942d9457420af1975bacf25f86c41d45b88b768a /src/mesa/main | |
| parent | cd28a19bd98173506f83298f9d526af0600a7c2f (diff) | |
mesa: remove FEATURE_OES_EGL_image define.
Signed-off-by: Oliver McFadden <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/api_exec.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/extensions.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/fbobject.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/mfeatures.h | 1 | ||||
| -rw-r--r-- | src/mesa/main/teximage.c | 2 |
5 files changed, 0 insertions, 9 deletions
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c index 5819f855a5c..8038a8f4eda 100644 --- a/src/mesa/main/api_exec.c +++ b/src/mesa/main/api_exec.c @@ -810,10 +810,8 @@ _mesa_create_exec_table(struct gl_context *ctx) SET_EndConditionalRenderNV(exec, _mesa_EndConditionalRender); } -#if FEATURE_OES_EGL_image SET_EGLImageTargetTexture2DOES(exec, _mesa_EGLImageTargetTexture2DOES); SET_EGLImageTargetRenderbufferStorageOES(exec, _mesa_EGLImageTargetRenderbufferStorageOES); -#endif #if FEATURE_APPLE_object_purgeable if (ctx->API != API_OPENGLES2) { diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c index f0007075d5f..c83ed8f21cf 100644 --- a/src/mesa/main/extensions.c +++ b/src/mesa/main/extensions.c @@ -236,11 +236,9 @@ static const struct extension extension_table[] = { { "GL_OES_depth32", o(dummy_false), DISABLE, 2005 }, { "GL_OES_depth_texture", o(ARB_depth_texture), ES2, 2006 }, { "GL_OES_draw_texture", o(OES_draw_texture), ES1, 2004 }, -#if FEATURE_OES_EGL_image /* 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 }, -#endif { "GL_OES_element_index_uint", o(dummy_true), ES1 | ES2, 2005 }, { "GL_OES_fbo_render_mipmap", o(EXT_framebuffer_object), ES1 | ES2, 2005 }, { "GL_OES_fixed_point", o(dummy_true), ES1, 2002 }, diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c index be65e6bc6b7..9730b77bf6a 100644 --- a/src/mesa/main/fbobject.c +++ b/src/mesa/main/fbobject.c @@ -1497,7 +1497,6 @@ renderbuffer_storage(GLenum target, GLenum internalFormat, } -#if FEATURE_OES_EGL_image void GLAPIENTRY _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) { @@ -1528,7 +1527,6 @@ _mesa_EGLImageTargetRenderbufferStorageOES(GLenum target, GLeglImageOES image) ctx->Driver.EGLImageTargetRenderbufferStorage(ctx, rb, image); } -#endif /** diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index a3eed797207..38903bc7cf4 100644 --- a/src/mesa/main/mfeatures.h +++ b/src/mesa/main/mfeatures.h @@ -103,7 +103,6 @@ #define FEATURE_NV_fragment_program FEATURE_GL #define FEATURE_NV_vertex_program FEATURE_GL -#define FEATURE_OES_EGL_image 1 #define FEATURE_OES_framebuffer_object FEATURE_ES #define FEATURE_OES_mapbuffer FEATURE_ES diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 02bd87ac613..3a37a7cd793 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -3134,7 +3134,6 @@ _mesa_TexImage3DEXT( GLenum target, GLint level, GLenum internalFormat, } -#if FEATURE_OES_EGL_image void GLAPIENTRY _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) { @@ -3189,7 +3188,6 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image) _mesa_unlock_texture(ctx, texObj); } -#endif |