diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/SConscript | 1 | ||||
| -rw-r--r-- | src/mesa/main/texcompress_etc.c | 71 | ||||
| -rw-r--r-- | src/mesa/main/texcompress_etc.h | 40 | ||||
| -rw-r--r-- | src/mesa/main/texcompress_etc_tmp.h | 136 | ||||
| -rw-r--r-- | src/mesa/sources.mak | 1 |
5 files changed, 249 insertions, 0 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript index 80760863640..bcb6a249137 100644 --- a/src/mesa/SConscript +++ b/src/mesa/SConscript @@ -116,6 +116,7 @@ main_sources = [ 'main/texcompress_rgtc.c', 'main/texcompress_s3tc.c', 'main/texcompress_fxt1.c', + 'main/texcompress_etc.c', 'main/texenv.c', 'main/texformat.c', 'main/texgen.c', diff --git a/src/mesa/main/texcompress_etc.c b/src/mesa/main/texcompress_etc.c new file mode 100644 index 00000000000..4d3b857cfc3 --- /dev/null +++ b/src/mesa/main/texcompress_etc.c @@ -0,0 +1,71 @@ +/* + * Copyright (C) 2011 LunarG, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/** + * \file texcompress_etc.c + * GL_OES_compressed_ETC1_RGB8_texture support. + */ + + +#include "mfeatures.h" +#include "texcompress.h" +#include "texcompress_etc.h" +#include "texstore.h" +#include "macros.h" +#include "swrast/s_context.h" + +GLboolean +_mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS) +{ + /* GL_ETC1_RGB8_OES is only valid in glCompressedTexImage2D */ + ASSERT(0); + + return GL_FALSE; +} + +/* define etc1_parse_block and etc. */ +#define UINT8_TYPE GLubyte +#define TAG(x) x +#include "texcompress_etc_tmp.h" +#undef TAG +#undef UINT8_TYPE + +void +_mesa_fetch_texel_2d_f_etc1_rgb8(const struct swrast_texture_image *texImage, + GLint i, GLint j, GLint k, GLfloat *texel) +{ + struct etc1_block block; + GLubyte dst[3]; + const GLubyte *src; + + src = (const GLubyte *) texImage->Data + + (((texImage->RowStride + 3) / 4) * (j / 4) + (i / 4)) * 8; + + etc1_parse_block(&block, src); + etc1_fetch_texel(&block, i % 4, j % 4, dst); + + texel[RCOMP] = UBYTE_TO_FLOAT(dst[0]); + texel[GCOMP] = UBYTE_TO_FLOAT(dst[1]); + texel[BCOMP] = UBYTE_TO_FLOAT(dst[2]); + texel[ACOMP] = 1.0f; +} diff --git a/src/mesa/main/texcompress_etc.h b/src/mesa/main/texcompress_etc.h new file mode 100644 index 00000000000..4e166b2b1fc --- /dev/null +++ b/src/mesa/main/texcompress_etc.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2011 LunarG, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifndef TEXCOMPRESS_ETC1_H +#define TEXCOMPRESS_ETC1_H + +#include "glheader.h" +#include "mfeatures.h" +#include "texstore.h" + +struct swrast_texture_image; + +extern GLboolean +_mesa_texstore_etc1_rgb8(TEXSTORE_PARAMS); + +extern void +_mesa_fetch_texel_2d_f_etc1_rgb8(const struct swrast_texture_image *texImage, + GLint i, GLint j, GLint k, GLfloat *texel); + +#endif diff --git a/src/mesa/main/texcompress_etc_tmp.h b/src/mesa/main/texcompress_etc_tmp.h new file mode 100644 index 00000000000..5c8c6decf8d --- /dev/null +++ b/src/mesa/main/texcompress_etc_tmp.h @@ -0,0 +1,136 @@ +/* + * Copyright (C) 2011 LunarG, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +/* + * Included by texcompress_etc1 and gallium to define ETC1 decoding routines. + */ + +struct TAG(etc1_block) { + uint32_t pixel_indices; + int flipped; + const int *modifier_tables[2]; + UINT8_TYPE base_colors[2][3]; +}; + +static UINT8_TYPE +TAG(etc1_base_color_diff_hi)(UINT8_TYPE in) +{ + return (in & 0xf8) | (in >> 5); +} + +static UINT8_TYPE +TAG(etc1_base_color_diff_lo)(UINT8_TYPE in) +{ + static const int lookup[8] = { 0, 1, 2, 3, -4, -3, -2, -1 }; + + in = (in >> 3) + lookup[in & 0x7]; + + return (in << 3) | (in >> 2); +} + +static UINT8_TYPE +TAG(etc1_base_color_ind_hi)(UINT8_TYPE in) +{ + return (in & 0xf0) | ((in & 0xf0) >> 4); +} + +static UINT8_TYPE +TAG(etc1_base_color_ind_lo)(UINT8_TYPE in) +{ + return ((in & 0xf) << 4) | (in & 0xf); +} + +static UINT8_TYPE +TAG(etc1_clamp)(UINT8_TYPE base, int modifier) +{ + int tmp = (int) base + modifier; + + /* CLAMP(tmp, 0, 255) */ + return (UINT8_TYPE) ((tmp < 0) ? 0 : ((tmp > 255) ? 255 : tmp)); +} + +static const int TAG(etc1_modifier_tables)[8][4] = { + { 2, 8, -2, -8}, + { 5, 17, -5, -17}, + { 9, 29, -9, -29}, + { 13, 42, -13, -42}, + { 18, 60, -18, -60}, + { 24, 80, -24, -80}, + { 33, 106, -33, -106}, + { 47, 183, -47, -183} +}; + +static void +TAG(etc1_parse_block)(struct TAG(etc1_block) *block, const UINT8_TYPE *src) +{ + if (src[3] & 0x2) { + /* differential mode */ + block->base_colors[0][0] = (int) TAG(etc1_base_color_diff_hi)(src[0]); + block->base_colors[1][0] = (int) TAG(etc1_base_color_diff_lo)(src[0]); + block->base_colors[0][1] = (int) TAG(etc1_base_color_diff_hi)(src[1]); + block->base_colors[1][1] = (int) TAG(etc1_base_color_diff_lo)(src[1]); + block->base_colors[0][2] = (int) TAG(etc1_base_color_diff_hi)(src[2]); + block->base_colors[1][2] = (int) TAG(etc1_base_color_diff_lo)(src[2]); + } + else { + /* individual mode */ + block->base_colors[0][0] = (int) TAG(etc1_base_color_ind_hi)(src[0]); + block->base_colors[1][0] = (int) TAG(etc1_base_color_ind_lo)(src[0]); + block->base_colors[0][1] = (int) TAG(etc1_base_color_ind_hi)(src[1]); + block->base_colors[1][1] = (int) TAG(etc1_base_color_ind_lo)(src[1]); + block->base_colors[0][2] = (int) TAG(etc1_base_color_ind_hi)(src[2]); + block->base_colors[1][2] = (int) TAG(etc1_base_color_ind_lo)(src[2]); + } + + /* pick modifier tables */ + block->modifier_tables[0] = TAG(etc1_modifier_tables)[(src[3] >> 5) & 0x7]; + block->modifier_tables[1] = TAG(etc1_modifier_tables)[(src[3] >> 2) & 0x7]; + + block->flipped = (src[3] & 0x1); + + block->pixel_indices = + (src[4] << 24) | (src[5] << 16) | (src[6] << 8) | src[7]; +} + +static void +TAG(etc1_fetch_texel)(const struct TAG(etc1_block) *block, + int x, int y, UINT8_TYPE *dst) +{ + const UINT8_TYPE *base_color; + int modifier, bit, idx, blk; + + /* get pixel index */ + bit = y + x * 4; + idx = ((block->pixel_indices >> (15 + bit)) & 0x2) | + ((block->pixel_indices >> (bit)) & 0x1); + + /* get subblock */ + blk = (block->flipped) ? (y >= 2) : (x >= 2); + + base_color = block->base_colors[blk]; + modifier = block->modifier_tables[blk][idx]; + + dst[0] = TAG(etc1_clamp)(base_color[0], modifier); + dst[1] = TAG(etc1_clamp)(base_color[1], modifier); + dst[2] = TAG(etc1_clamp)(base_color[2], modifier); +} diff --git a/src/mesa/sources.mak b/src/mesa/sources.mak index e72a1ce1ec0..1f109fb36cc 100644 --- a/src/mesa/sources.mak +++ b/src/mesa/sources.mak @@ -83,6 +83,7 @@ MAIN_SOURCES = \ main/texcompress_rgtc.c \ main/texcompress_s3tc.c \ main/texcompress_fxt1.c \ + main/texcompress_etc.c \ main/texenv.c \ main/texformat.c \ main/texgen.c \ |