[Mesa-dev] [PATCH 29/45] mesa: remove FEATURE_OES_EGL_image define.
Oliver McFadden
oliver.mcfadden at linux.intel.com
Tue Sep 11 02:56:42 PDT 2012
Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
---
src/mesa/drivers/dri/intel/intel_extensions.c | 2 --
src/mesa/drivers/dri/intel/intel_fbo.c | 5 -----
src/mesa/drivers/dri/intel/intel_tex_image.c | 5 -----
src/mesa/drivers/dri/r200/r200_context.c | 3 ---
src/mesa/drivers/dri/radeon/radeon_context.c | 4 ----
src/mesa/drivers/dri/radeon/radeon_fbo.c | 4 ----
src/mesa/drivers/dri/radeon/radeon_texture.c | 4 ----
src/mesa/drivers/dri/radeon/radeon_texture.h | 2 --
src/mesa/main/api_exec.c | 2 --
src/mesa/main/extensions.c | 2 --
src/mesa/main/fbobject.c | 2 --
src/mesa/main/mfeatures.h | 1 -
src/mesa/main/teximage.c | 2 --
src/mesa/state_tracker/st_cb_eglimage.c | 4 ----
src/mesa/state_tracker/st_cb_eglimage.h | 11 -----------
src/mesa/state_tracker/st_extensions.c | 2 --
16 files changed, 0 insertions(+), 55 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
index 885e8a4..89f6c1e 100755
--- a/src/mesa/drivers/dri/intel/intel_extensions.c
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c
@@ -86,9 +86,7 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.NV_vertex_program = true;
ctx->Extensions.NV_vertex_program1_1 = true;
ctx->Extensions.TDFX_texture_compression_FXT1 = true;
-#if FEATURE_OES_EGL_image
ctx->Extensions.OES_EGL_image = true;
-#endif
ctx->Extensions.OES_draw_texture = true;
ctx->Extensions.OES_compressed_ETC1_RGB8_texture = true;
ctx->Extensions.ARB_texture_rgb10_a2ui = true;
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index c522b48..61eac58 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -279,7 +279,6 @@ intel_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffer
}
-#if FEATURE_OES_EGL_image
static void
intel_image_target_renderbuffer_storage(struct gl_context *ctx,
struct gl_renderbuffer *rb,
@@ -323,7 +322,6 @@ intel_image_target_renderbuffer_storage(struct gl_context *ctx,
rb->_BaseFormat = _mesa_base_fbo_format(&intel->ctx,
image->internal_format);
}
-#endif
/**
* Called for each hardware renderbuffer when a _window_ is resized.
@@ -956,9 +954,6 @@ intel_fbo_init(struct intel_context *intel)
intel->ctx.Driver.ResizeBuffers = intel_resize_buffers;
intel->ctx.Driver.ValidateFramebuffer = intel_validate_framebuffer;
intel->ctx.Driver.BlitFramebuffer = intel_blit_framebuffer;
-
-#if FEATURE_OES_EGL_image
intel->ctx.Driver.EGLImageTargetRenderbufferStorage =
intel_image_target_renderbuffer_storage;
-#endif
}
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index fe9040c..a08a5a2 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -326,7 +326,6 @@ intelSetTexBuffer(__DRIcontext *pDRICtx, GLint target, __DRIdrawable *dPriv)
intelSetTexBuffer2(pDRICtx, target, __DRI_TEXTURE_FORMAT_RGBA, dPriv);
}
-#if FEATURE_OES_EGL_image
static void
intel_image_target_texture_2d(struct gl_context *ctx, GLenum target,
struct gl_texture_object *texObj,
@@ -347,14 +346,10 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target,
target, image->internal_format,
image->format, image->offset);
}
-#endif
void
intelInitTextureImageFuncs(struct dd_function_table *functions)
{
functions->TexImage = intelTexImage;
-
-#if FEATURE_OES_EGL_image
functions->EGLImageTargetTexture2D = intel_image_target_texture_2d;
-#endif
}
diff --git a/src/mesa/drivers/dri/r200/r200_context.c b/src/mesa/drivers/dri/r200/r200_context.c
index cb8c040..57bca06 100644
--- a/src/mesa/drivers/dri/r200/r200_context.c
+++ b/src/mesa/drivers/dri/r200/r200_context.c
@@ -397,10 +397,7 @@ GLboolean r200CreateContext( gl_api api,
ctx->Extensions.MESA_pack_invert = true;
ctx->Extensions.NV_blend_square = true;
ctx->Extensions.NV_texture_rectangle = true;
-#if FEATURE_OES_EGL_image
ctx->Extensions.OES_EGL_image = true;
-#endif
-
ctx->Extensions.EXT_framebuffer_object = true;
ctx->Extensions.ARB_occlusion_query = true;
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c
index f151747..0ee0aee 100644
--- a/src/mesa/drivers/dri/radeon/radeon_context.c
+++ b/src/mesa/drivers/dri/radeon/radeon_context.c
@@ -353,12 +353,8 @@ r100CreateContext( gl_api api,
ctx->Extensions.ATI_texture_mirror_once = true;
ctx->Extensions.MESA_ycbcr_texture = true;
ctx->Extensions.NV_blend_square = true;
-#if FEATURE_OES_EGL_image
ctx->Extensions.OES_EGL_image = true;
-#endif
-
ctx->Extensions.EXT_framebuffer_object = true;
-
ctx->Extensions.ARB_texture_cube_map = true;
if (rmesa->radeon.glCtx->Mesa_DXTn) {
diff --git a/src/mesa/drivers/dri/radeon/radeon_fbo.c b/src/mesa/drivers/dri/radeon/radeon_fbo.c
index 2d99416..73456b6 100644
--- a/src/mesa/drivers/dri/radeon/radeon_fbo.c
+++ b/src/mesa/drivers/dri/radeon/radeon_fbo.c
@@ -560,7 +560,6 @@ radeon_alloc_renderbuffer_storage(struct gl_context * ctx, struct gl_renderbuffe
return GL_TRUE;
}
-#if FEATURE_OES_EGL_image
static void
radeon_image_target_renderbuffer_storage(struct gl_context *ctx,
struct gl_renderbuffer *rb,
@@ -600,7 +599,6 @@ radeon_image_target_renderbuffer_storage(struct gl_context *ctx,
rb->_BaseFormat = _mesa_base_fbo_format(radeon->glCtx,
image->internal_format);
}
-#endif
/**
* Called for each hardware renderbuffer when a _window_ is resized.
@@ -959,10 +957,8 @@ void radeon_fbo_init(struct radeon_context *radeon)
#if FEATURE_EXT_framebuffer_blit
radeon->glCtx->Driver.BlitFramebuffer = _mesa_meta_BlitFramebuffer;
#endif
-#if FEATURE_OES_EGL_image
radeon->glCtx->Driver.EGLImageTargetRenderbufferStorage =
radeon_image_target_renderbuffer_storage;
-#endif
}
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.c b/src/mesa/drivers/dri/radeon/radeon_texture.c
index 007e061..4835147 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.c
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.c
@@ -586,7 +586,6 @@ unsigned radeonIsFormatRenderable(gl_format mesa_format)
}
}
-#if FEATURE_OES_EGL_image
void radeon_image_target_texture_2d(struct gl_context *ctx, GLenum target,
struct gl_texture_object *texObj,
struct gl_texture_image *texImage,
@@ -645,7 +644,6 @@ void radeon_image_target_texture_2d(struct gl_context *ctx, GLenum target,
if (!radeon_miptree_matches_image(t->mt, &radeonImage->base.Base))
fprintf(stderr, "miptree doesn't match image\n");
}
-#endif
gl_format _radeon_texformat_rgba8888 = MESA_FORMAT_NONE;
gl_format _radeon_texformat_argb8888 = MESA_FORMAT_NONE;
@@ -693,9 +691,7 @@ radeon_init_common_texture_funcs(radeonContextPtr radeon,
functions->CopyTexSubImage = radeonCopyTexSubImage;
functions->Bitmap = _mesa_meta_Bitmap;
-#if FEATURE_OES_EGL_image
functions->EGLImageTargetTexture2D = radeon_image_target_texture_2d;
-#endif
radeonInitTextureFormats();
}
diff --git a/src/mesa/drivers/dri/radeon/radeon_texture.h b/src/mesa/drivers/dri/radeon/radeon_texture.h
index 88aace8..b18beb0 100644
--- a/src/mesa/drivers/dri/radeon/radeon_texture.h
+++ b/src/mesa/drivers/dri/radeon/radeon_texture.h
@@ -77,12 +77,10 @@ void radeonCopyTexSubImage(struct gl_context *ctx, GLuint dims,
unsigned radeonIsFormatRenderable(gl_format mesa_format);
-#if FEATURE_OES_EGL_image
void radeon_image_target_texture_2d(struct gl_context *ctx, GLenum target,
struct gl_texture_object *texObj,
struct gl_texture_image *texImage,
GLeglImageOES image_handle);
-#endif
void
radeon_init_common_texture_funcs(radeonContextPtr radeon,
diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 44c6580..3758887 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -817,10 +817,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 5fca506..50cf004 100644
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -238,11 +238,9 @@ static const struct extension extension_table[] = {
#if FEATURE_ES1
{ "GL_OES_draw_texture", o(OES_draw_texture), ES1, 2004 },
#endif
-#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 138f101..4ae1d21 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 a3eed79..38903bc 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 3cf74f2..1c6c57b 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
diff --git a/src/mesa/state_tracker/st_cb_eglimage.c b/src/mesa/state_tracker/st_cb_eglimage.c
index e91e914..0679e7d 100644
--- a/src/mesa/state_tracker/st_cb_eglimage.c
+++ b/src/mesa/state_tracker/st_cb_eglimage.c
@@ -38,8 +38,6 @@
#include "st_format.h"
#include "st_manager.h"
-#if FEATURE_OES_EGL_image
-
/**
* Return the base format just like _mesa_base_fbo_format does.
*/
@@ -164,5 +162,3 @@ st_init_eglimage_functions(struct dd_function_table *functions)
functions->EGLImageTargetTexture2D = st_egl_image_target_texture_2d;
functions->EGLImageTargetRenderbufferStorage = st_egl_image_target_renderbuffer_storage;
}
-
-#endif /* FEATURE_OES_EGL_image */
diff --git a/src/mesa/state_tracker/st_cb_eglimage.h b/src/mesa/state_tracker/st_cb_eglimage.h
index 48567ed..1750b91 100644
--- a/src/mesa/state_tracker/st_cb_eglimage.h
+++ b/src/mesa/state_tracker/st_cb_eglimage.h
@@ -34,18 +34,7 @@
struct dd_function_table;
-#if FEATURE_OES_EGL_image
-
extern void
st_init_eglimage_functions(struct dd_function_table *functions);
-#else
-
-static INLINE void
-st_init_eglimage_functions(struct dd_function_table *functions)
-{
-}
-
-#endif
-
#endif /* ST_CB_EGLIMAGE_H */
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index e7c98a3..c6de14b 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -530,11 +530,9 @@ void st_init_extensions(struct st_context *st)
ctx->Extensions.NV_vertex_program1_1 = GL_TRUE;
#endif
-#if FEATURE_OES_EGL_image
ctx->Extensions.OES_EGL_image = GL_TRUE;
if (ctx->API != API_OPENGL)
ctx->Extensions.OES_EGL_image_external = GL_TRUE;
-#endif
#if FEATURE_ES1
ctx->Extensions.OES_draw_texture = GL_TRUE;
#endif
--
1.7.8.6
More information about the mesa-dev
mailing list