diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-12 21:24:06 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2007-12-12 21:24:06 -0800 |
| commit | f116634933cf19fe2a52a3be4e106be643cb1d0b (patch) | |
| tree | adfd449684b4aafb1abdda9d3795d637002fc847 /src/mesa/drivers/dri/intel/intel_tex_format.c | |
| parent | c79c93c0acd184e0333c1c9cedfbce11381e66e2 (diff) | |
| parent | 37406c2038c418a1d6f26b5ac5691586c9f05631 (diff) | |
Merge branch 'master' into autoconf2
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_format.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_format.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_format.c b/src/mesa/drivers/dri/intel/intel_tex_format.c index 6e058dff69..51ea1e69cb 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_format.c +++ b/src/mesa/drivers/dri/intel/intel_tex_format.c @@ -140,6 +140,27 @@ intelChooseTextureFormat(GLcontext * ctx, GLint internalFormat, case GL_DEPTH24_STENCIL8_EXT: return &_mesa_texformat_z24_s8; +#ifndef I915 + case GL_SRGB_EXT: + case GL_SRGB8_EXT: + case GL_SRGB_ALPHA_EXT: + case GL_SRGB8_ALPHA8_EXT: + case GL_SLUMINANCE_EXT: + case GL_SLUMINANCE8_EXT: + case GL_SLUMINANCE_ALPHA_EXT: + case GL_SLUMINANCE8_ALPHA8_EXT: + case GL_COMPRESSED_SRGB_EXT: + case GL_COMPRESSED_SRGB_ALPHA_EXT: + case GL_COMPRESSED_SLUMINANCE_EXT: + case GL_COMPRESSED_SLUMINANCE_ALPHA_EXT: + return &_mesa_texformat_srgba8; + case GL_COMPRESSED_SRGB_S3TC_DXT1_EXT: + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT: + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT: + case GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT: + return &_mesa_texformat_srgb_dxt1; +#endif + default: fprintf(stderr, "unexpected texture format %s in %s\n", _mesa_lookup_enum_by_nr(internalFormat), __FUNCTION__); |