drewcassidy/quicktex
1
0
Fork 0
mirror of https://github.com/drewcassidy/quicktex.git synced 2024-06-11 06:04:05 +00:00
Code Issues Projects Releases Activity

In hindsight, SingleColorTable doesnt need to be a class at all

Browse Source
This commit is contained in:
Andrew Cassidy 2021-02-26 22:38:37 -08:00
parent b57a3d2561
commit ab752e51b6
3 changed files with 58 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/BC1/BC1Encoder.cpp
View File

@ -187,15 +187,14 @@ void BC1Encoder::EncodeBlockSingleColor(Color color, BC1Block *dest) const {
bool using_3color = false;
// why is there no subscript operator for shared_ptr<array>
auto match_r = _single_match5[color.r];
auto match_g = _single_match6[color.g];
auto match_b = _single_match5[color.b];
BC1MatchEntry match_r = _single_match5->at(color.r);
BC1MatchEntry match_g = _single_match6->at(color.g);
BC1MatchEntry match_b = _single_match5->at(color.b);
if ((_flags & (Flags::Use3ColorBlocks | Flags::Use3ColorBlocksForBlackPixels)) != Flags::None) {
auto match_r_half = _single_match5_half[color.r];
auto match_g_half = _single_match6_half[color.g];
auto match_b_half = _single_match5_half[color.b];
BC1MatchEntry match_r_half = _single_match5_half->at(color.r);
BC1MatchEntry match_g_half = _single_match6_half->at(color.g);
BC1MatchEntry match_b_half = _single_match5_half->at(color.b);
const unsigned err4 = match_r.error + match_g.error + match_b.error;
const unsigned err3 = match_r_half.error + match_g_half.error + match_b_half.error;

24
src/BC1/BC1Encoder.h
View File

@ -36,7 +36,7 @@
namespace rgbcx {
class BC1Encoder : public BlockEncoder<BC1Block, 4, 4> {
class BC1Encoder final : public BlockEncoder<BC1Block, 4, 4> {
public:
using InterpolatorPtr = std::shared_ptr<Interpolator>;
@ -99,11 +99,6 @@ class BC1Encoder : public BlockEncoder<BC1Block, 4, 4> {
EndpointSearchRoundsMask = 1023U << EndpointSearchRoundsShift,
};
BC1Encoder(InterpolatorPtr interpolator);
void EncodeBlock(Color4x4 pixels, BC1Block *dest) const override;
private:
// Unpacked BC1 block with metadata
struct EncodeResults {
Color low;
@ -114,6 +109,11 @@ class BC1Encoder : public BlockEncoder<BC1Block, 4, 4> {
unsigned error = UINT_MAX;
};
BC1Encoder(InterpolatorPtr interpolator);
void EncodeBlock(Color4x4 pixels, BC1Block *dest) const override;
private:
using Hash = uint16_t;
using BlockMetrics = Color4x4::BlockMetrics;
@ -123,10 +123,10 @@ class BC1Encoder : public BlockEncoder<BC1Block, 4, 4> {
// Each entry includes a high and low pair that best reproduces the 8-bit index as well as possible,
// with an included error value
// these depend on the interpolator
const SingleColorTable<5, 4> _single_match5 = SingleColorTable<5, 4>(_interpolator);
const SingleColorTable<6, 4> _single_match6 = SingleColorTable<6, 4>(_interpolator);
const SingleColorTable<5, 3> _single_match5_half = SingleColorTable<5, 3>(_interpolator);
const SingleColorTable<6, 3> _single_match6_half = SingleColorTable<6, 3>(_interpolator);
const MatchListPtr _single_match5 = SingleColorTable<5, 4>(_interpolator);
const MatchListPtr _single_match6 = SingleColorTable<6, 4>(_interpolator);
const MatchListPtr _single_match5_half = SingleColorTable<5, 3>(_interpolator);
const MatchListPtr _single_match6_half = SingleColorTable<6, 3>(_interpolator);
Flags _flags;
unsigned _search_rounds;
@ -145,7 +145,7 @@ class BC1Encoder : public BlockEncoder<BC1Block, 4, 4> {
unsigned FindSelectors4(Color4x4 pixels, BC1Encoder::EncodeResults &block, bool use_err) const;
bool ComputeEndpointsLS(Color4x4 pixels, EncodeResults &block, BlockMetrics metrics, bool is_3color, bool use_black) const;
/* bool ComputeEndpointsLS(Color4x4 pixels, EncodeResults &block, BlockMetrics metrics, Hash hash, Vector4 &matrix, std::array<Vector4, 17> &sums,
bool is_3color, bool use_black) const;*/
/* bool ComputeEndpointsLS(Color4x4 pixels, EncodeResults &block, BlockMetrics metrics, Hash hash, Vector4 &matrix, std::array<Vector4, 17> &sums,
bool is_3color, bool use_black) const;*/
};
} // namespace rgbcx

95
src/BC1/SingleColorTable.h
View File

@ -33,75 +33,60 @@ namespace rgbcx {
* @tparam B Number of bits (5 or 6)
* @tparam N Number of colors (3 or 4)
*/
template <size_t B, size_t N> class SingleColorTable {
public:
struct MatchEntry {
uint8_t high;
uint8_t low;
uint8_t error;
};
struct BC1MatchEntry {
uint8_t high;
uint8_t low;
uint8_t error;
};
using MatchList = std::array<MatchEntry, 256>;
using MatchListPtr = std::shared_ptr<MatchList>;
using InterpolatorPtr = std::shared_ptr<Interpolator>;
using MatchList = std::array<BC1MatchEntry, 256>;
using MatchListPtr = std::shared_ptr<MatchList>;
using InterpolatorPtr = std::shared_ptr<Interpolator>;
SingleColorTable(InterpolatorPtr interpolator) {
static_assert((B == 5 && Size == 32) || (B == 6 && Size == 64));
static_assert(N == 4 || N == 3);
template <size_t B, size_t N> MatchListPtr SingleColorTable(InterpolatorPtr interpolator) {
constexpr size_t Size = 1 << B;
MatchListPtr _matches = std::make_shared<MatchList>();
bool ideal = interpolator->IsIdeal();
bool use_8bit = interpolator->CanInterpolate8Bit();
static_assert((B == 5 && Size == 32) || (B == 6 && Size == 64));
static_assert(N == 4 || N == 3);
for (unsigned i = 0; i < 256; i++) {
unsigned error = 256;
bool ideal = interpolator->IsIdeal();
bool use_8bit = interpolator->CanInterpolate8Bit();
// TODO: Can probably avoid testing for values that definitely wont yield good results,
// e.g. low8 and high8 both much smaller or larger than index
for (uint8_t low = 0; low < Size; low++) {
uint8_t low8 = (B == 5) ? scale5To8(low) : scale6To8(low);
for (unsigned i = 0; i < 256; i++) {
unsigned error = 256;
for (uint8_t high = 0; high < Size; high++) {
uint8_t high8 = (B == 5) ? scale5To8(high) : scale6To8(high);
uint8_t value;
// TODO: Can probably avoid testing for values that definitely wont yield good results,
// e.g. low8 and high8 both much smaller or larger than index
for (uint8_t low = 0; low < Size; low++) {
uint8_t low8 = (B == 5) ? scale5To8(low) : scale6To8(low);
if (use_8bit) {
value = interpolator->Interpolate8(high8, low8);
} else {
value = (B == 5) ? interpolator->Interpolate5(high, low) : interpolator->Interpolate6(high, low);
}
for (uint8_t high = 0; high < Size; high++) {
uint8_t high8 = (B == 5) ? scale5To8(high) : scale6To8(high);
uint8_t value;
unsigned new_error = iabs(value - (int)i);
if (use_8bit) {
value = interpolator->Interpolate8(high8, low8);
} else {
value = (B == 5) ? interpolator->Interpolate5(high, low) : interpolator->Interpolate6(high, low);
}
// We only need to factor in 3% error in BC1 ideal mode.
if (ideal) new_error += (iabs(high8 - (int)low8) * 3) / 100;
unsigned new_error = iabs(value - (int)i);
if ((new_error < error) || (new_error == error && low == high)) {
assert(new_error <= UINT8_MAX);
// We only need to factor in 3% error in BC1 ideal mode.
if (ideal) new_error += (iabs(high8 - (int)low8) * 3) / 100;
(*_matches)[i].low = (uint8_t)low;
(*_matches)[i].high = (uint8_t)high;
(*_matches)[i].error = (uint8_t)new_error;
if ((new_error < error) || (new_error == error && low == high)) {
assert(new_error <= UINT8_MAX);
error = new_error;
}
(*_matches)[i].low = (uint8_t)low;
(*_matches)[i].high = (uint8_t)high;
(*_matches)[i].error = (uint8_t)new_error;
error = new_error;
}
}
}
}
MatchEntry operator[](size_t index) const {
assert(index <= UINT8_MAX);
return (*_matches)[index];
}
MatchEntry &operator[](size_t index) {
assert(index <= UINT8_MAX);
return (*_matches)[index];
}
private:
static inline constexpr size_t Size = 1 << B;
MatchListPtr _matches = std::make_shared<MatchList>();
};
}
} // namespace rgbcx