diff options
| author | Anuj Phogat <anuj.phogat@gmail.com> | 2012-10-09 17:02:37 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2012-12-07 16:29:48 -0800 |
| commit | 7697f25667d13031a46d1c373ea53919c06c9df5 (patch) | |
| tree | 088806f6723668539a49fa30f33813df1cb03495 /src/mesa/main/texcompress.c | |
| parent | aa217090f52dc532b84186a63c07167bd82e8f22 (diff) | |
mesa: Add decoding functions for GL_COMPRESSED_SIGNED_R11_EAC
Data in GL_COMPRESSED_SIGNED_R11_EAC format is decoded and stored in
MESA_FORMAT_SIGNED_R16.
v2:
16 bit signed data is converted to 16 bit unsigned data by
adding 2 ^ 15 and stored in an unsigned texture format.
v3:
1. Handle a corner case when base code word value is -128. As per
OpenGL ES 3.0 specification -128 is not an allowed value and should
be truncated to -127.
2. Converting a decoded 16 bit signed data to 16 bit unsigned data by
adding 2 ^ 15 gives us an output which matches the decompressed image
(.ppm) generated by ericsson's etcpack tool. ericsson is also doing this
conversion in their tool because .ppm image files don't support signed
data. But gles 3.0 specification doesn't suggest this conversion. We
need to keep the decoded data in signed format. Both signed format
tests in gles3 conformance pass with these changes.
Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Tested-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/main/texcompress.c')
| -rw-r--r-- | src/mesa/main/texcompress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/texcompress.c b/src/mesa/main/texcompress.c index f9148d4260f..38d31804487 100644 --- a/src/mesa/main/texcompress.c +++ b/src/mesa/main/texcompress.c @@ -626,7 +626,7 @@ _mesa_decompress_image(gl_format format, GLuint width, GLuint height, fetch = _mesa_fetch_texel_2d_f_etc2_rg11_eac; break; case MESA_FORMAT_ETC2_SIGNED_R11_EAC: - /* fetch = _mesa_fetch_texel_2d_f_etc2_signed_r11_eac; -- not implemented yet */ + fetch = _mesa_fetch_texel_2d_f_etc2_signed_r11_eac; break; case MESA_FORMAT_ETC2_SIGNED_RG11_EAC: /* fetch = _mesa_fetch_texel_2d_f_etc2_signed_rg11_eac; -- not implemented yet */ |