mesa: remove feature tests

4 files changed, 0 insertions, 28 deletions

diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index ebe59f8960..c98e90d1c3 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -261,8 +261,6 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 0, 0, 0, 8,               /* Lum/Int/Index/Depth/StencilBits */
       1, 1, 1                      /* BlockWidth/Height,Bytes */
    },
-
-#if FEATURE_EXT_texture_sRGB
    {
       MESA_FORMAT_SRGB8,
       GL_RGB,
@@ -303,7 +301,6 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       8, 0, 0, 0, 0,
       1, 1, 2
    },
-#if FEATURE_texture_s3tc
    {
       MESA_FORMAT_SRGB_DXT1,       /* Name */
       GL_RGB,                      /* BaseFormat */
@@ -336,10 +333,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 0, 0, 0, 0,
       4, 4, 16                     /* 16 bytes per 4x4 block */
    },
-#endif
-#endif
 
-#if FEATURE_texture_fxt1
    {
       MESA_FORMAT_RGB_FXT1,
       GL_RGB,
@@ -356,9 +350,7 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 0, 0, 0, 0,
       8, 4, 16                     /* 16 bytes per 8x4 block */
    },
-#endif
 
-#if FEATURE_texture_s3tc
    {
       MESA_FORMAT_RGB_DXT1,        /* Name */
       GL_RGB,                      /* BaseFormat */
@@ -391,8 +383,6 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 0, 0, 0, 0,
       4, 4, 16                     /* 16 bytes per 4x4 block */
    },
-#endif
-
    {
       MESA_FORMAT_RGBA_FLOAT32,
       GL_RGBA,
@@ -489,7 +479,6 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 16, 0, 0, 0,
       1, 1, 2
    },
-
    {
       MESA_FORMAT_DUDV8,
       GL_DUDV_ATI,
@@ -498,7 +487,6 @@ static struct gl_format_info format_info[MESA_FORMAT_COUNT] =
       0, 0, 0, 0, 0,
       1, 1, 2
    },
-
    {
       MESA_FORMAT_SIGNED_RGBA8888,
       GL_RGBA,
diff --git a/src/mesa/main/formats.h b/src/mesa/main/formats.h
index 316ff1a8ec..7a2a948991 100644
--- a/src/mesa/main/formats.h
+++ b/src/mesa/main/formats.h
@@ -79,7 +79,6 @@ typedef enum
    MESA_FORMAT_S8,              /*                               SSSS SSSS */
    /*@}*/
 
-#if FEATURE_EXT_texture_sRGB
    /**
     * \name 8-bit/channel sRGB formats
     */
@@ -89,29 +88,22 @@ typedef enum
    MESA_FORMAT_SARGB8,
    MESA_FORMAT_SL8,
    MESA_FORMAT_SLA8,
-#if FEATURE_texture_s3tc
    MESA_FORMAT_SRGB_DXT1,
    MESA_FORMAT_SRGBA_DXT1,
    MESA_FORMAT_SRGBA_DXT3,
    MESA_FORMAT_SRGBA_DXT5,
-#endif
    /*@}*/
-#endif
 
    /**
     * \name Compressed texture formats.
     */
    /*@{*/
-#if FEATURE_texture_fxt1
    MESA_FORMAT_RGB_FXT1,
    MESA_FORMAT_RGBA_FXT1,
-#endif
-#if FEATURE_texture_s3tc
    MESA_FORMAT_RGB_DXT1,
    MESA_FORMAT_RGBA_DXT1,
    MESA_FORMAT_RGBA_DXT3,
    MESA_FORMAT_RGBA_DXT5,
-#endif
    /*@}*/
 
    /**
diff --git a/src/mesa/main/texfetch.c b/src/mesa/main/texfetch.c
index 851659e9c5..fbb3170ff5 100644
--- a/src/mesa/main/texfetch.c
+++ b/src/mesa/main/texfetch.c
@@ -41,8 +41,6 @@
 #include "texfetch.h"
 
 
-#if FEATURE_EXT_texture_sRGB
-
 /**
  * Convert an 8-bit sRGB value from non-linear space to a
  * linear RGB value in [0, 1].
@@ -71,8 +69,6 @@ nonlinear_to_linear(GLubyte cs8)
 }
 
 
-#endif /* FEATURE_EXT_texture_sRGB */
-
 
 /* Texel fetch routines for all supported formats
  */
diff --git a/src/mesa/main/texfetch_tmp.h b/src/mesa/main/texfetch_tmp.h
index 3ac932b979..43030c2985 100644
--- a/src/mesa/main/texfetch_tmp.h
+++ b/src/mesa/main/texfetch_tmp.h
@@ -989,8 +989,6 @@ static void store_texel_ci8(struct gl_texture_image *texImage,
 #endif
 
 
-#if FEATURE_EXT_texture_sRGB
-
 /* Fetch texel from 1D, 2D or 3D srgb8 texture, return 4 GLfloats */
 /* Note: component order is same as for MESA_FORMAT_RGB888 */
 static void FETCH(srgb8)(const struct gl_texture_image *texImage,
@@ -1100,8 +1098,6 @@ static void store_texel_sla8(struct gl_texture_image *texImage,
 }
 #endif
 
-#endif /* FEATURE_EXT_texture_sRGB */
-
 
 /* MESA_FORMAT_DUDV8 ********************************************************/