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

Evas rg_etc2: Small performance fix 

Alpha is always 255 otherwise we need to loop around and
clamp the values to 255 anyways.
This commit is contained in:
Jean-Philippe Andre 2014-05-07 17:08:19 +09:00
parent 525bc4117a
commit 939b5e47a0
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/static_libs/rg_etc/rg_etc2.c
View File

@ -114,7 +114,7 @@ static const int kAlphaModifiers[16][8] = {
static inline void static inline void
_T_mode_color_read(const uint8_t *etc, uint32_t *paint_colors, int alpha) _T_mode_color_read(const uint8_t *etc, uint32_t *paint_colors)
{ {
// 4 bit colors // 4 bit colors
const int r1_4 = (BITS(etc[0], 3, 4) << 2) | BITS(etc[0], 0, 1); const int r1_4 = (BITS(etc[0], 3, 4) << 2) | BITS(etc[0], 0, 1);
@ -129,20 +129,20 @@ _T_mode_color_read(const uint8_t *etc, uint32_t *paint_colors, int alpha)
const int d = kDistances[didx]; const int d = kDistances[didx];
// Write out paint colors for T mode // Write out paint colors for T mode
paint_colors[0] = BGRA(_4to8(r1_4), _4to8(g1_4), _4to8(b1_4), alpha); paint_colors[0] = BGRA(_4to8(r1_4), _4to8(g1_4), _4to8(b1_4), 255);
paint_colors[1] = BGRA(CLAMPDOWN(_4to8(r2_4) + d), paint_colors[1] = BGRA(CLAMPDOWN(_4to8(r2_4) + d),
CLAMPDOWN(_4to8(g2_4) + d), CLAMPDOWN(_4to8(g2_4) + d),
CLAMPDOWN(_4to8(b2_4) + d), CLAMPDOWN(_4to8(b2_4) + d),
alpha); 255);
paint_colors[2] = BGRA(_4to8(r2_4), _4to8(g2_4), _4to8(b2_4), alpha); paint_colors[2] = BGRA(_4to8(r2_4), _4to8(g2_4), _4to8(b2_4), 255);
paint_colors[3] = BGRA(CLAMPUP(_4to8(r2_4) - d), paint_colors[3] = BGRA(CLAMPUP(_4to8(r2_4) - d),
CLAMPUP(_4to8(g2_4) - d), CLAMPUP(_4to8(g2_4) - d),
CLAMPUP(_4to8(b2_4) - d), CLAMPUP(_4to8(b2_4) - d),
alpha); 255);
} }
static inline void static inline void
_H_mode_color_read(const uint8_t *etc, uint32_t *paint_colors, int alpha) _H_mode_color_read(const uint8_t *etc, uint32_t *paint_colors)
{ {
// 4 bit colors // 4 bit colors
const int r1_4 = BITS(etc[0], 3, 6); const int r1_4 = BITS(etc[0], 3, 6);
@ -165,23 +165,23 @@ _H_mode_color_read(const uint8_t *etc, uint32_t *paint_colors, int alpha)
paint_colors[0] = BGRA(CLAMPDOWN(_4to8(r1_4) + d), paint_colors[0] = BGRA(CLAMPDOWN(_4to8(r1_4) + d),
CLAMPDOWN(_4to8(g1_4) + d), CLAMPDOWN(_4to8(g1_4) + d),
CLAMPDOWN(_4to8(b1_4) + d), CLAMPDOWN(_4to8(b1_4) + d),
alpha); 255);
paint_colors[1] = BGRA(CLAMPUP(_4to8(r1_4) - d), paint_colors[1] = BGRA(CLAMPUP(_4to8(r1_4) - d),
CLAMPUP(_4to8(g1_4) - d), CLAMPUP(_4to8(g1_4) - d),
CLAMPUP(_4to8(b1_4) - d), CLAMPUP(_4to8(b1_4) - d),
alpha); 255);
paint_colors[2] = BGRA(CLAMPDOWN(_4to8(r2_4) + d), paint_colors[2] = BGRA(CLAMPDOWN(_4to8(r2_4) + d),
CLAMPDOWN(_4to8(g2_4) + d), CLAMPDOWN(_4to8(g2_4) + d),
CLAMPDOWN(_4to8(b2_4) + d), CLAMPDOWN(_4to8(b2_4) + d),
alpha); 255);
paint_colors[3] = BGRA(CLAMPUP(_4to8(r2_4) - d), paint_colors[3] = BGRA(CLAMPUP(_4to8(r2_4) - d),
CLAMPUP(_4to8(g2_4) - d), CLAMPUP(_4to8(g2_4) - d),
CLAMPUP(_4to8(b2_4) - d), CLAMPUP(_4to8(b2_4) - d),
alpha); 255);
} }
static inline void static inline void
_planar_mode_color_read(const uint8_t *etc, uint32_t *bgra, int alpha) _planar_mode_color_read(const uint8_t *etc, uint32_t *bgra)
{ {
// RO: Bits 57-62 // RO: Bits 57-62
const int RO = _6to8(BITS(etc[0], 1, 6)); const int RO = _6to8(BITS(etc[0], 1, 6));
@ -209,7 +209,7 @@ _planar_mode_color_read(const uint8_t *etc, uint32_t *bgra, int alpha)
const int R = CLAMP(((x * (RH - RO)) + y * (RV - RO) + 4 * RO + 2) >> 2); const int R = CLAMP(((x * (RH - RO)) + y * (RV - RO) + 4 * RO + 2) >> 2);
const int G = CLAMP(((x * (GH - GO)) + y * (GV - GO) + 4 * GO + 2) >> 2); const int G = CLAMP(((x * (GH - GO)) + y * (GV - GO) + 4 * GO + 2) >> 2);
const int B = CLAMP(((x * (BH - BO)) + y * (BV - BO) + 4 * BO + 2) >> 2); const int B = CLAMP(((x * (BH - BO)) + y * (BV - BO) + 4 * BO + 2) >> 2);
*bgra++ = BGRA(R, G, B, alpha); *bgra++ = BGRA(R, G, B, 255);
} }
} }
@ -262,21 +262,21 @@ rg_etc2_rgb8_decode_block(const uint8_t *etc, uint32_t *bgra)
if ((R + dR) < 0 || (R + dR) >= 32) if ((R + dR) < 0 || (R + dR) >= 32)
{ {
// T mode // T mode
_T_mode_color_read(etc, paint_colors, 255); _T_mode_color_read(etc, paint_colors);
_TH_paint(etc, paint_colors, bgra); _TH_paint(etc, paint_colors, bgra);
return; return;
} }
if ((G + dG) < 0 || (G + dG) >= 32) if ((G + dG) < 0 || (G + dG) >= 32)
{ {
// H mode // H mode
_H_mode_color_read(etc, paint_colors, 255); _H_mode_color_read(etc, paint_colors);
_TH_paint(etc, paint_colors, bgra); _TH_paint(etc, paint_colors, bgra);
return; return;
} }
if ((B + dB) < 0 || (B + dB) >= 32) if ((B + dB) < 0 || (B + dB) >= 32)
{ {
// Planar mode // Planar mode
_planar_mode_color_read(etc, bgra, 255); _planar_mode_color_read(etc, bgra);
return; return;
} }