diff options
| author | Oliver McFadden <oliver.mcfadden@linux.intel.com> | 2012-09-11 09:39:12 +0300 |
|---|---|---|
| committer | Oliver McFadden <oliver.mcfadden@linux.intel.com> | 2012-09-15 12:57:04 +0300 |
| commit | ab8d76357fe17b7b380e6f513f3385e2d39ca06d (patch) | |
| tree | 859b21a8019a5e61362a2cfcac305e647220430b /src/mesa/main/texformat.c | |
| parent | beb293e4cdbdbb012ee866c9548466b24e6b2194 (diff) | |
| download | external_mesa3d-ab8d76357fe17b7b380e6f513f3385e2d39ca06d.zip external_mesa3d-ab8d76357fe17b7b380e6f513f3385e2d39ca06d.tar.gz external_mesa3d-ab8d76357fe17b7b380e6f513f3385e2d39ca06d.tar.bz2 | |
mesa: remove FEATURE_texture_s3tc define.
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/texformat.c')
| -rw-r--r-- | src/mesa/main/texformat.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c index e9e4f5c..910f318 100644 --- a/src/mesa/main/texformat.c +++ b/src/mesa/main/texformat.c @@ -302,7 +302,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, } } -#if FEATURE_texture_s3tc if (ctx->Extensions.EXT_texture_compression_s3tc) { switch (internalFormat) { case GL_COMPRESSED_RGB_S3TC_DXT1_EXT: @@ -336,7 +335,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, ; /* fallthrough */ } } -#endif if (ctx->Extensions.ARB_texture_float) { switch (internalFormat) { @@ -585,22 +583,17 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); break; case GL_COMPRESSED_SRGB_EXT: -#if FEATURE_texture_s3tc if (ctx->Extensions.EXT_texture_compression_s3tc) RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1); -#endif RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB8); RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); break; case GL_COMPRESSED_SRGB_ALPHA_EXT: -#if FEATURE_texture_s3tc if (ctx->Extensions.EXT_texture_compression_s3tc) RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT3); /* Not srgba_dxt1, see spec */ -#endif RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA8); RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); break; -#if FEATURE_texture_s3tc case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: if (ctx->Extensions.EXT_texture_compression_s3tc) RETURN_IF_SUPPORTED(MESA_FORMAT_SRGB_DXT1); @@ -621,7 +614,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target, RETURN_IF_SUPPORTED(MESA_FORMAT_SRGBA_DXT5); RETURN_IF_SUPPORTED(MESA_FORMAT_SARGB8); break; -#endif default: ; /* fallthrough */ } |