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

more cleanup and bugfixes

Browse Source
This commit is contained in:
Andrew Cassidy 2021-03-03 14:49:06 -08:00
parent 277b38a548
commit 9fbe5a2b22
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/BC1/BC1Encoder.cpp
View File

@ -61,15 +61,9 @@ BC1Encoder::BC1Encoder(InterpolatorPtr interpolator) : _interpolator(interpolato
}
void BC1Encoder::EncodeBlock(Color4x4 pixels, BC1Block *dest) const {
auto r_view = pixels.GetChannel(0);
auto g_view = pixels.GetChannel(1);
auto b_view = pixels.GetChannel(2);
Color first = pixels.Get(0, 0);
if (pixels.IsSingleColor()) {
// single-color pixel block, do it the fast way
WriteBlockSolid(first, dest);
WriteBlockSolid(pixels.Get(0, 0), dest);
return;
}
@ -201,7 +195,6 @@ void BC1Encoder::WriteBlockSolid(Color color, BC1Block *dest) const {
}
void BC1Encoder::WriteBlock(EncodeResults &block, BC1Block *dest) const {
bool flip = false;
BC1Block::UnpackedSelectors selectors;
uint16_t color1 = block.low.Pack565Unscaled();
uint16_t color0 = block.high.Pack565Unscaled();

5
src/BC1/Histogram.h
View File

@ -69,10 +69,7 @@ template <size_t N> class Histogram {
}
unsigned GetPacked() const {
unsigned packed = 0;
for (unsigned i = 0; i < (N - 1); i++) { packed |= (_bins[i] << (4U * i)); }
return packed;
return Pack<uint8_t, Hash, 4, N>(_bins);
}
private: