diff options
author | Eric Anholt <eric@anholt.net> | 2013-04-17 19:10:29 -0700 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2013-04-29 11:41:33 -0700 |
commit | 4df1b986d3e44dc035227054000a1d0e1846ef07 (patch) | |
tree | 34c1be234a2decbc284b56a27a3eca91f10744ce /src/mesa/drivers/dri/i915/i915_texstate.c | |
parent | 97217a40f97cdeae0304798b607f704deb0c3558 (diff) | |
download | external_mesa3d-4df1b986d3e44dc035227054000a1d0e1846ef07.zip external_mesa3d-4df1b986d3e44dc035227054000a1d0e1846ef07.tar.gz external_mesa3d-4df1b986d3e44dc035227054000a1d0e1846ef07.tar.bz2 |
i915: Add support for GL_EXT_texture_sRGB and GL_EXT_texture_sRGB_decode.
This brings the driver up to GL 2.1.
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_texstate.c')
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_texstate.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index 2f32869..43c802b 100644 --- a/src/mesa/drivers/dri/i915/i915_texstate.c +++ b/src/mesa/drivers/dri/i915/i915_texstate.c @@ -56,6 +56,7 @@ translate_texture_format(gl_format mesa_format, GLenum DepthMode) return MAPSURF_16BIT | MT_16BIT_ARGB1555; case MESA_FORMAT_ARGB4444: return MAPSURF_16BIT | MT_16BIT_ARGB4444; + case MESA_FORMAT_SARGB8: case MESA_FORMAT_ARGB8888: return MAPSURF_32BIT | MT_32BIT_ARGB8888; case MESA_FORMAT_XRGB8888: @@ -78,10 +79,14 @@ translate_texture_format(gl_format mesa_format, GLenum DepthMode) return (MAPSURF_16BIT | MT_16BIT_L16); case MESA_FORMAT_RGBA_DXT1: case MESA_FORMAT_RGB_DXT1: + case MESA_FORMAT_SRGB_DXT1: + case MESA_FORMAT_SRGBA_DXT1: return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT1); case MESA_FORMAT_RGBA_DXT3: + case MESA_FORMAT_SRGBA_DXT3: return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT2_3); case MESA_FORMAT_RGBA_DXT5: + case MESA_FORMAT_SRGBA_DXT5: return (MAPSURF_COMPRESSED | MT_COMPRESS_DXT4_5); case MESA_FORMAT_S8_Z24: case MESA_FORMAT_X8_Z24: @@ -354,6 +359,12 @@ i915_update_tex_unit(struct intel_context *intel, GLuint unit, GLuint ss3) } + if (sampler->sRGBDecode == GL_DECODE_EXT && + (_mesa_get_srgb_format_linear(firstImage->TexFormat) != + firstImage->TexFormat)) { + state[I915_TEXREG_SS2] |= SS2_REVERSE_GAMMA_ENABLE; + } + /* convert border color from float to ubyte */ CLAMPED_FLOAT_TO_UBYTE(border[0], sampler->BorderColor.f[0]); CLAMPED_FLOAT_TO_UBYTE(border[1], sampler->BorderColor.f[1]); |