yuzu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2025-01-08 05:55:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some bug fixes and optimizations.

Browse source
This commit is contained in:
Pavel Krajcevski 2013-10-14 20:59:46 -04:00
parent c8101b46f7
commit 48d0cae9f0
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
PVRTCEncoder/src/Compressor.cpp
View file

@ -151,7 +151,7 @@ namespace PVRTCC {
#ifndef NDEBUG
template<typename T>
void AssertPOT(const T &t) {
assert(t & (t - 1) == 0);
assert((t & (t - 1)) == 0);
}
#else
#define AssertPOT(x) (void)(0)
@ -517,22 +517,23 @@ namespace PVRTCC {
FasTC::Pixel tmp(p);
tmp = sum / (16);
#if 0
const uint8 fullDepth[4] = { 8, 8, 8, 8 };
tmp.ChangeBitDepth(fullDepth);
#else
tmp.A() = (tmp.A() << 4) | tmp.A();
tmp.G() = (tmp.G() << 3) | (tmp.G() >> 2);
tmp.B() = (tmp.B() << 3) | (tmp.B() >> 2);
tmp.R() = (tmp.R() << 3) | (tmp.R() >> 2);
#endif
const uint8 currentDepth[4] = { 4, 5, 5, 5 };
const uint8 fractionDepth[4] = { 4, 4, 4, 4 };
for(uint32 c = 0; c < 4; c++) {
const uint32 denominator = (1 << currentDepth[c]);
const uint32 numerator = denominator + 1;
const uint32 shift = fractionDepth[c] - (fullDepth[c] - currentDepth[c]);
const uint32 numerator = (1 << currentDepth[c]) + 1;
const uint32 shift = 4 - (8 - currentDepth[c]);
const uint32 fractionBits = fp.Component(c) >> shift;
uint32 component = tmp.Component(c);
component += ((fractionBits * numerator) / denominator);
uint16 component = tmp.Component(c);
component += ((fractionBits * numerator) >> currentDepth[c]);
tmp.Component(c) = component;
}
@ -656,7 +657,6 @@ namespace PVRTCC {
pixelBlock = &bottomLeftBlock;
}
assert(pixelBlockIdx < blocksW * blocksH);
pixelBlock->SetLerpValue((pixelY & 3) * 4 + (pixelX & 3), bestMod);
}
}
@ -674,8 +674,8 @@ namespace PVRTCC {
const uint32 height = cj.height;
// Make sure that width and height are a power of two.
assert(width & (width - 1) == 0);
assert(height & (height - 1) == 0);
assert((width & (width - 1)) == 0);
assert((height & (height - 1)) == 0);
CompressionLabel *labels =
(CompressionLabel *)calloc(width * height, sizeof(CompressionLabel));