diff options
| author | Eric Anholt <eric@anholt.net> | 2007-12-12 12:09:07 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-12-12 12:09:07 -0800 |
| commit | 5ad260246bbcd3f40f9f7f64fac82f1fb2aa3efb (patch) | |
| tree | fbcd8a2d5f2780f1b48cc750ac2f265e569faee8 /src/mesa | |
| parent | 7c71ef3a3d0cf2620525f468960cdc76a0fb0d33 (diff) | |
| download | external_mesa3d-5ad260246bbcd3f40f9f7f64fac82f1fb2aa3efb.zip external_mesa3d-5ad260246bbcd3f40f9f7f64fac82f1fb2aa3efb.tar.gz external_mesa3d-5ad260246bbcd3f40f9f7f64fac82f1fb2aa3efb.tar.bz2 | |
[965] Bug #13600: Fix assertion failure with SRGB textures.
I broke this with cherry-pick resolving on
93c98a466947570e0589b662df49095b2f4bc43c.
Diffstat (limited to 'src/mesa')
| -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 6e058df..51ea1e6 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__); |