diff options
| author | José Fonseca <[email protected]> | 2012-09-15 18:15:22 +0100 |
|---|---|---|
| committer | José Fonseca <[email protected]> | 2012-09-15 18:18:39 +0100 |
| commit | b6c2234c22d5a935012870fa254e68d026ef265e (patch) | |
| tree | 46441ab3b3110cd9f9c600b821efee6be8feecc9 /src/mesa/main/teximage.c | |
| parent | e78ebbc5f9448d459b57884d90b0a6496294c1dd (diff) | |
Temporarily revert "mesa: remove remaining FEATURE_* defines where protected by API check."
This reverts commit 9f37b405a3de8668a5f74c9681829688475ac3b7.
Fixes windows builds.
Diffstat (limited to 'src/mesa/main/teximage.c')
| -rw-r--r-- | src/mesa/main/teximage.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 8143c52638e..da8fbcd3276 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1954,6 +1954,7 @@ 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: @@ -1996,6 +1997,7 @@ compressed_texture_error_check(struct gl_context *ctx, GLint dimensions, */ level = -level; break; +#endif default: choose_format = GL_NONE; @@ -2945,11 +2947,12 @@ 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 (ctx->API == API_OPENGLES && compressed && !error && dims == 2) { + if (compressed && !error && dims == 2) { switch (internalFormat) { case GL_PALETTE4_RGB8_OES: case GL_PALETTE4_RGBA8_OES: @@ -2966,6 +2969,7 @@ 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 */ |