mesa: remove FEATURE_texture_fxt1 define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/extensions.c b/src/mesa/main/extensions.c
index 2899db8377828d02ab70a09904cd6ce1dcaff5ec..e80b8b5ebfa3342eeafd5181062469326ce5f4bd 100644 (file)
--- a/src/mesa/main/extensions.c
+++ b/src/mesa/main/extensions.c
@@ -522,9 +522,7 @@ _mesa_enable_sw_extensions(struct gl_context *ctx)
 #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program
    ctx->Extensions.EXT_gpu_program_parameters = GL_TRUE;
 #endif
-#if FEATURE_texture_fxt1
    _mesa_enable_extension(ctx, "GL_3DFX_texture_compression_FXT1");
-#endif
 #if FEATURE_texture_s3tc
    if (ctx->Mesa_DXTn) {
       _mesa_enable_extension(ctx, "GL_EXT_texture_compression_s3tc");

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index 1fa641c92ee7854e9e0bfee47ed67eb8aa97acd6..5bc8235a34dfb76553fc7a9955cde1bfbb0dced7 100644 (file)
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -2265,10 +2265,8 @@ _mesa_format_to_type_and_comps(gl_format format,
       return;
 #endif
 
-#if FEATURE_texture_fxt1
    case MESA_FORMAT_RGB_FXT1:
    case MESA_FORMAT_RGBA_FXT1:
-#endif
 #if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
    case MESA_FORMAT_RGBA_DXT1:

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 8062628d3ac6a5a7825d03eb07d7d434334dea23..97bb8b28d6143c7e6dd8cac1bc2954420562aa87 100644 (file)
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -84,7 +84,6 @@
 #define FEATURE_remap_table               0
 #endif
 
-#define FEATURE_texture_fxt1              FEATURE_GL
 #define FEATURE_texture_s3tc              FEATURE_GL
 
 #define FEATURE_extra_context_init        FEATURE_ES

diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c
index 846d4bb639aecab79d5e9378c15fdcc3249052cf..ff4a9e768aa6a37a6d6171c7ffc4d532067b5eed 100644 (file)
--- a/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@ -375,12 +375,10 @@ GLenum
 _mesa_compressed_format_to_glenum(struct gl_context *ctx, gl_format mesaFormat)
 {
    switch (mesaFormat) {
-#if FEATURE_texture_fxt1
    case MESA_FORMAT_RGB_FXT1:
       return GL_COMPRESSED_RGB_FXT1_3DFX;
    case MESA_FORMAT_RGBA_FXT1:
       return GL_COMPRESSED_RGBA_FXT1_3DFX;
-#endif
 #if FEATURE_texture_s3tc
    case MESA_FORMAT_RGB_DXT1:
       return GL_COMPRESSED_RGB_S3TC_DXT1_EXT;

diff --git a/src/mesa/main/texcompress_fxt1.c b/src/mesa/main/texcompress_fxt1.c
index 3fc7dab967cef883df4b63d5accf342c1d841251..eeed78891c96eeebb1c3fc1a3e56d4e7434c4646 100644 (file)
--- a/src/mesa/main/texcompress_fxt1.c
+++ b/src/mesa/main/texcompress_fxt1.c
@@ -42,9 +42,6 @@
 #include "swrast/s_context.h"
 
 
-#if FEATURE_texture_fxt1
-
-
 static void
 fxt1_encode (GLuint width, GLuint height, GLint comps,
              const void *source, GLint srcRowStride,
@@ -1646,6 +1643,3 @@ fxt1_decode_1 (const void *texture, GLint stride, /* in pixels */
 
    decode_1[mode](code, t, rgba);
 }
-
-
-#endif /* FEATURE_texture_fxt1 */

diff --git a/src/mesa/main/texcompress_fxt1.h b/src/mesa/main/texcompress_fxt1.h
index bd84082e9ed3ea2b5eca208d94d680025cd39e8b..2a8b8d6538cf616f75ef8116513174a2df4c6cb4 100644 (file)
--- a/src/mesa/main/texcompress_fxt1.h
+++ b/src/mesa/main/texcompress_fxt1.h
@@ -31,8 +31,6 @@
 
 struct swrast_texture_image;
 
-#if FEATURE_texture_fxt1
-
 extern GLboolean
 _mesa_texstore_rgb_fxt1(TEXSTORE_PARAMS);
 
@@ -47,16 +45,4 @@ extern void
 _mesa_fetch_texel_2d_f_rgb_fxt1(const struct swrast_texture_image *texImage,
                                 GLint i, GLint j, GLint k, GLfloat *texel);
 
-#else /* FEATURE_texture_fxt1 */
-
-/* these are used only in texstore_funcs[] */
-#define _mesa_texstore_rgb_fxt1 NULL
-#define _mesa_texstore_rgba_fxt1 NULL
-
-/* these are used only in texfetch_funcs[] */
-#define _mesa_fetch_texel_2d_f_rgba_fxt1 NULL
-#define _mesa_fetch_texel_2d_f_rgb_fxt1 NULL
-
-#endif /* FEATURE_texture_fxt1 */
-
 #endif /* TEXCOMPRESS_FXT1_H */

diff --git a/src/mesa/main/texformat.c b/src/mesa/main/texformat.c
index 1a318abe488c25429a2f5557b009afc5045d9c87..e9e4f5cee8e69d02a00ea3e06982170767aba175 100644 (file)
--- a/src/mesa/main/texformat.c
+++ b/src/mesa/main/texformat.c
@@ -289,7 +289,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
       }
    }
 
-#if FEATURE_texture_fxt1
    if (ctx->Extensions.TDFX_texture_compression_FXT1) {
       switch (internalFormat) {
          case GL_COMPRESSED_RGB_FXT1_3DFX:
@@ -302,7 +301,6 @@ _mesa_choose_tex_format(struct gl_context *ctx, GLenum target,
             ; /* fallthrough */
       }
    }
-#endif
 
 #if FEATURE_texture_s3tc
    if (ctx->Extensions.EXT_texture_compression_s3tc) {