Scarfski/basis_universal
1
0
Fork 0
mirror of https://github.com/BinomialLLC/basis_universal.git synced 2026-06-08 08:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changing the ETC1S->BC4 and ETC1S->ETC2 EAC transcoders so they convert from the source red channel, not source green. Source red makes more sense when transcoding to BC4/BC5, especially when the source texture only has color slices. BC4 is red, and BC5 is red/green. This change makes no difference if the source texture slices are grayscale.

Browse Source
This commit is contained in:
Rich Geldreich
2019-05-10 22:04:40 -07:00
parent 7b9fdb1340
commit 81464a6d6b
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
transcoder/basisu_transcoder.cpp
View File

@@ -2362,7 +2362,7 @@ namespace basist
}
};
static void convert_etc1s_to_dxt5a(dxt5a_block * pDst_block, const decoder_etc_block * pSrc_block, const selector * pSelector)
static void convert_etc1s_to_dxt5a(dxt5a_block *pDst_block, const decoder_etc_block *pSrc_block, const selector *pSelector)
{
const uint32_t low_selector = pSelector->m_lo_selector;
const uint32_t high_selector = pSelector->m_hi_selector;
@@ -2376,10 +2376,10 @@ namespace basist
decoder_etc_block::get_block_colors5(block_colors, base_color, inten_table);
const uint32_t g = block_colors[low_selector].g;
const uint32_t r = block_colors[low_selector].r;
pDst_block->set_low_alpha(g);
pDst_block->set_high_alpha(g);
pDst_block->set_low_alpha(r);
pDst_block->set_high_alpha(r);
pDst_block->m_selectors[0] = 0;
pDst_block->m_selectors[1] = 0;
pDst_block->m_selectors[2] = 0;
@@ -2394,11 +2394,11 @@ namespace basist
decoder_etc_block::get_block_colors5(block_colors, base_color, inten_table);
const uint32_t g0 = block_colors[low_selector].g;
const uint32_t g1 = block_colors[high_selector].g;
const uint32_t r0 = block_colors[low_selector].r;
const uint32_t r1 = block_colors[high_selector].r;
pDst_block->set_low_alpha(g0);
pDst_block->set_high_alpha(g1);
pDst_block->set_low_alpha(r0);
pDst_block->set_high_alpha(r1);
// TODO: Optimize this
for (uint32_t y = 0; y < 4; y++)
@@ -2420,7 +2420,7 @@ namespace basist
if (selector_range_table >= NUM_DXT5A_SELECTOR_RANGES)
selector_range_table = 0;
const etc1_g_to_dxt5a_conversion * pTable_entry = &g_etc1_g_to_dxt5a[base_color.g + inten_table * 32][selector_range_table];
const etc1_g_to_dxt5a_conversion *pTable_entry = &g_etc1_g_to_dxt5a[base_color.r + inten_table * 32][selector_range_table];
pDst_block->set_low_alpha(pTable_entry->m_lo);
pDst_block->set_high_alpha(pTable_entry->m_hi);
@@ -3253,11 +3253,11 @@ namespace basist
decoder_etc_block::get_block_colors5(block_colors, base_color, inten_table);
const uint32_t g = block_colors[low_selector].g;
const uint32_t r = block_colors[low_selector].r;
// Constant color block
// Select table 13, use selector 4 (0), set multiplier to 1 and base color g
pDst_block->m_base = g;
pDst_block->m_base = r;
pDst_block->m_table = 13;
pDst_block->m_multiplier = 1;
@@ -3275,7 +3275,7 @@ namespace basist
if (selector_range_table >= NUM_ETC2_EAC_A8_SELECTOR_RANGES)
selector_range_table = 0;
const etc1_g_to_etc2_a8_conversion * pTable_entry = &s_etc1_g_to_etc2_a8[base_color.g + inten_table * 32][selector_range_table];
const etc1_g_to_etc2_a8_conversion *pTable_entry = &s_etc1_g_to_etc2_a8[base_color.r + inten_table * 32][selector_range_table];
pDst_block->m_base = pTable_entry->m_base;
pDst_block->m_table = pTable_entry->m_table_mul >> 4;