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/drivers/dri/radeon | |
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/drivers/dri/radeon')
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_context.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_fbo.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texture.h | 2 |
4 files changed, 0 insertions, 14 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_context.c b/src/mesa/drivers/dri/radeon/radeon_context.c index f151747abcd..0ee0aeedfa1 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 2d99416f893..73456b6fd44 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 007e06157e9..4835147558b 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 88aace840bb..b18beb0e60b 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, |