diff options
| author | Oliver McFadden <[email protected]> | 2012-09-13 10:44:09 +0300 |
|---|---|---|
| committer | Oliver McFadden <[email protected]> | 2012-09-15 12:57:57 +0300 |
| commit | 9f37b405a3de8668a5f74c9681829688475ac3b7 (patch) | |
| tree | 65278c8be5965885686f40b5de87d7b6c1570b53 /src/mesa/main/teximage.c | |
| parent | ab1a9430c3a4c2ec52e0dbb969a01165dd33ce4b (diff) | |
mesa: remove remaining FEATURE_* defines where protected by API check.
Signed-off-by: Oliver McFadden <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main/teximage.c')
| -rw-r--r-- | src/mesa/main/teximage.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index da8fbcd3276..8143c52638e 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1954,7 +1954,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions, } switch (internalFormat) { -#if FEATURE_ES case GL_PALETTE4_RGB8_OES: case GL_PALETTE4_RGBA8_OES: case GL_PALETTE4_R5_G6_B5_OES: @@ -1997,7 +1996,6 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions, */ level = -level; break; -#endif default: choose_format = GL_NONE; @@ -2947,12 +2945,11 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, format, type, width, height, depth, border); } -#if FEATURE_ES /* Here we convert a cpal compressed image into a regular glTexImage2D * call by decompressing the texture. If we really want to support cpal * textures in any driver this would have to be changed. */ - if (compressed && !error && dims == 2) { + if (ctx->API == API_OPENGLES && compressed && !error && dims == 2) { switch (internalFormat) { case GL_PALETTE4_RGB8_OES: case GL_PALETTE4_RGBA8_OES: @@ -2969,7 +2966,6 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims, return; } } -#endif if (_mesa_is_proxy_texture(target)) { /* Proxy texture: just clear or set state depending on error checking */ |