drewcassidy/quicktex
1
0
Fork 0
mirror of https://github.com/drewcassidy/quicktex.git synced 2024-09-13 06:37:34 +00:00
Code Issues Projects Releases Activity

Cleanup

Browse Source
This commit is contained in:
Andrew Cassidy 2021-02-27 17:07:58 -08:00
parent 193ac22eb5
commit b4f180f5de
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/BC1/BC1Encoder.cpp
View File

@ -194,10 +194,10 @@ void BC1Encoder::EncodeBlock(Color4x4 pixels, BC1Block *dest) const {
Vector4 low, high; Vector4 low, high;
bool multicolor = ComputeEndpoints<ColorMode::FourColor>(pixels, trial_result, metrics); bool multicolor = ComputeEndpoints<ColorMode::FourColor>(pixels, trial_result, metrics);
if (multicolor) { if (!multicolor) {
FindSelectors4(pixels, trial_result, needs_block_error);
} else {
FindEndpointsSingleColor(trial_result, pixels, metrics.avg, false); FindEndpointsSingleColor(trial_result, pixels, metrics.avg, false);
} else {
FindSelectors4(pixels, trial_result, needs_block_error);
} }
if (trial_result.low == round_result.low && trial_result.high == round_result.high) break; if (trial_result.low == round_result.low && trial_result.high == round_result.high) break;
@ -211,7 +211,6 @@ void BC1Encoder::EncodeBlock(Color4x4 pixels, BC1Block *dest) const {
if (!needs_block_error || round_result.error < result.error) { result = round_result; } if (!needs_block_error || round_result.error < result.error) { result = round_result; }
} }
bool usedCF = false;
// First refinement pass using ordered cluster fit // First refinement pass using ordered cluster fit
if (result.error > 0 && (_flags & Flags::UseLikelyTotalOrderings) != Flags::None) { if (result.error > 0 && (_flags & Flags::UseLikelyTotalOrderings) != Flags::None) {
const unsigned total_iters = (_flags & Flags::Iterative) != Flags::None ? 2 : 1; const unsigned total_iters = (_flags & Flags::Iterative) != Flags::None ? 2 : 1;
@ -253,31 +252,22 @@ void BC1Encoder::EncodeBlock(Color4x4 pixels, BC1Block *dest) const {
FindEndpointsSingleColor(trial_result, pixels, metrics.avg, false); FindEndpointsSingleColor(trial_result, pixels, metrics.avg, false);
} else { } else {
ComputeEndpoints<ColorMode::FourColor>(sums, trial_result, trial_matrix, trial_hash); ComputeEndpoints<ColorMode::FourColor>(sums, trial_result, trial_matrix, trial_hash);
}
FindSelectors4(pixels, trial_result, true); FindSelectors4(pixels, trial_result, true);
if (trial_result.error < result.error) {
result = trial_result;
usedCF = true;
} }
if (trial_result.error < result.error) { result = trial_result; }
if (trial_result.error == 0) break; if (trial_result.error == 0) break;
} }
} }
} }
EncodeBlock4Color(result, dest); EncodeBlock4Color(result, dest);
// if (result.low == result.high) {
// EncodeBlockSingleColor(metrics.avg, dest);
// } else {
// EncodeBlock4Color(result, dest);
// }
} }
void BC1Encoder::EncodeBlockSingleColor(Color color, BC1Block *dest) const { void BC1Encoder::EncodeBlockSingleColor(Color color, BC1Block *dest) const {
uint8_t mask = 0xAA; // 2222 uint8_t mask = 0xAA; // 2222
uint16_t min16, max16; uint16_t min16, max16;
if ((color.r | color.g | color.g) == 0) { if ((color.r | color.g | color.b) == 0) {
// quick shortcut for all-black blocks // quick shortcut for all-black blocks
min16 = 0; min16 = 0;
max16 = 1; max16 = 1;