NorwayFun
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rg_etc1: Fix encoding of solid color blocks 

The ETC1 encoder is expected to write all 8 bytes of the
output data. But in case of a solid color block, it was writing
only 1 of the first 3 bytes (R, G, B). So lots of solid blocks
were containing invalid data (for instance: R + dR < 0 or > 255).
This commit is contained in:
Jean-Philippe Andre 2014-04-18 15:31:43 +09:00
parent 7ff410b9f6
commit ca0c608b66
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/static_libs/rg_etc/rg_etc1.c
View File

@ -2088,8 +2088,11 @@ void rg_etc1_pack_block_init()
break;
}
}
// ERROR CASE NO ASSERT IN EVAS CODE
if (!(best_error <= 255)) return ;
if (!(best_error <= 255))
{
fprintf(stderr, "ETC1: Failed to write the inverse lookup table!\n");
return;
}
rg_etc1_inverse_lookup[inverse_table_index][color] = (uint16)(best_packed_c | (best_error << 8));
}
}
@ -2111,8 +2114,14 @@ void rg_etc1_pack_block_init()
static uint64
rg_etc1_pack_block_solid_color(unsigned char *block, const uint8* pColor, rg_etc1_pack_params *pack_params EINA_UNUSED)
{
// ERROR CASE NO ASSERT IN EVAS CODE
if (!rg_etc1_inverse_lookup[0][255]) return 0;
if (!rg_etc1_inverse_lookup[0][255])
rg_etc1_pack_block_init();
if (!rg_etc1_inverse_lookup[0][255])
{
fprintf(stderr, "ETC1: Inverse lookup table not set!\n");
return 0;
}
static uint s_next_comp[4] = { 1, 2, 0, 1 };
@ -2181,6 +2190,7 @@ rg_etc1_pack_block_solid_color(unsigned char *block, const uint8* pColor, rg_etc
uint best_packed_c0;
uint selector_val;
block[0] = block[1] = block[2] = 0;
block[3] = (uint8)(((inten | (inten << 3)) << 2) | (diff << 1));
etc1_selector = rg_etc_selector_index_to_etc1[(best_x >> 4) & 3];