diff options
| author | Oliver McFadden <oliver.mcfadden@linux.intel.com> | 2012-09-11 11:11:56 +0300 |
|---|---|---|
| committer | Oliver McFadden <oliver.mcfadden@linux.intel.com> | 2012-09-15 12:57:48 +0300 |
| commit | 88233b0bc301eb0ccdf23ffcb0245b3faad43b04 (patch) | |
| tree | d7098225ddb79bc7e77a70582dd3f97c8df58e46 /src/mesa/main/texcompress_s3tc.c | |
| parent | e9ccb5fe52f1ff22eb8f6ac6ff0f4414b712e2e6 (diff) | |
| download | external_mesa3d-88233b0bc301eb0ccdf23ffcb0245b3faad43b04.zip external_mesa3d-88233b0bc301eb0ccdf23ffcb0245b3faad43b04.tar.gz external_mesa3d-88233b0bc301eb0ccdf23ffcb0245b3faad43b04.tar.bz2 | |
mesa: remove FEATURE_EXT_texture_sRGB define.
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/texcompress_s3tc.c')
| -rw-r--r-- | src/mesa/main/texcompress_s3tc.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mesa/main/texcompress_s3tc.c b/src/mesa/main/texcompress_s3tc.c index 9c04196..6476f11 100644 --- a/src/mesa/main/texcompress_s3tc.c +++ b/src/mesa/main/texcompress_s3tc.c @@ -57,7 +57,6 @@ #define DXTN_LIBNAME "libtxc_dxtn.so" #endif -#if FEATURE_EXT_texture_sRGB /** * Convert an 8-bit sRGB value from non-linear space to a * linear RGB value in [0, 1]. @@ -84,7 +83,6 @@ nonlinear_to_linear(GLubyte cs8) } return table[cs8]; } -#endif /* FEATURE_EXT_texture_sRGB */ typedef void (*dxtFetchTexelFuncExt)( GLint srcRowstride, GLubyte *pixdata, GLint col, GLint row, GLvoid *texelOut ); @@ -475,7 +473,6 @@ _mesa_fetch_texel_rgba_dxt5(const struct swrast_texture_image *texImage, texel[ACOMP] = UBYTE_TO_FLOAT(rgba[ACOMP]); } -#if FEATURE_EXT_texture_sRGB void _mesa_fetch_texel_srgb_dxt1(const struct swrast_texture_image *texImage, GLint i, GLint j, GLint k, GLfloat *texel) @@ -527,4 +524,3 @@ _mesa_fetch_texel_srgba_dxt5(const struct swrast_texture_image *texImage, texel[BCOMP] = nonlinear_to_linear(rgba[BCOMP]); texel[ACOMP] = UBYTE_TO_FLOAT(rgba[ACOMP]); } -#endif /* FEATURE_EXT_texture_sRGB */ |