diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-17 16:10:59 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-17 16:10:59 +0200 |
| commit | e3c4aa34268f99562e66b43a7d9efcd16ca072e6 (patch) | |
| tree | 8c827f3f78e2c2093734b68045f2a13045ca15d0 /mesalib/src/mesa/main/formats.c | |
| parent | b08ba56019b146786e1cde553c036dd0c4fd02e5 (diff) | |
| download | vcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.tar.gz vcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.tar.bz2 vcxsrv-e3c4aa34268f99562e66b43a7d9efcd16ca072e6.zip | |
mesa xserver pixman git update 17 sep 2012
Diffstat (limited to 'mesalib/src/mesa/main/formats.c')
| -rw-r--r-- | mesalib/src/mesa/main/formats.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/mesalib/src/mesa/main/formats.c b/mesalib/src/mesa/main/formats.c index 1fa641c92..df23af1dd 100644 --- a/mesalib/src/mesa/main/formats.c +++ b/mesalib/src/mesa/main/formats.c @@ -2245,7 +2245,6 @@ _mesa_format_to_type_and_comps(gl_format format, *comps = 4; return; -#if FEATURE_EXT_texture_sRGB case MESA_FORMAT_SRGB8: *datatype = GL_UNSIGNED_BYTE; *comps = 3; @@ -2263,24 +2262,17 @@ _mesa_format_to_type_and_comps(gl_format format, *datatype = GL_UNSIGNED_BYTE; *comps = 2; 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: case MESA_FORMAT_RGBA_DXT3: case MESA_FORMAT_RGBA_DXT5: -#if FEATURE_EXT_texture_sRGB case MESA_FORMAT_SRGB_DXT1: case MESA_FORMAT_SRGBA_DXT1: case MESA_FORMAT_SRGBA_DXT3: case MESA_FORMAT_SRGBA_DXT5: -#endif -#endif case MESA_FORMAT_RED_RGTC1: case MESA_FORMAT_SIGNED_RED_RGTC1: case MESA_FORMAT_RG_RGTC2: |