mirrors-yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC synced 2024-11-23 17:13:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Some small bug fixes to our still awful compressor.

Browse source
This commit is contained in:
Pavel Krajcevski 2013-09-25 20:10:18 -04:00
parent a57c40005c
commit 4de5f90edf
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
PVRTCEncoder/src/Compressor.cpp
View file

@ -267,7 +267,7 @@ namespace PVRTCC {
const Pixel po = original(i, j); const Pixel po = original(i, j);
// !FIXME! there are two modulation modes... we're only using one. // !FIXME! there are two modulation modes... we're only using one.
uint8 modSteps[4] = { 0, 3, 5, 8 }; uint8 modSteps[4] = { 8, 5, 3, 0 };
uint8 bestMod = 0; uint8 bestMod = 0;
uint32 bestError = 0xFFFFFFFF; uint32 bestError = 0xFFFFFFFF;
for(uint32 s = 0; s < 4; s++) { for(uint32 s = 0; s < 4; s++) {
@ -297,16 +297,19 @@ namespace PVRTCC {
const uint32 blocksW = dcj.width / 4; const uint32 blocksW = dcj.width / 4;
const uint32 blocksH = dcj.height / 4; const uint32 blocksH = dcj.height / 4;
assert(imgA.GetHeight() == blocksH);
assert(imgA.GetWidth() == blocksW);
std::vector<uint64> blocks; std::vector<uint64> blocks;
blocks.reserve(blocksW * blocksH); blocks.reserve(blocksW * blocksH);
for(uint32 j = 0; j < blocksH; j++) { for(uint32 j = 0; j < blocksH; j++) {
for(uint32 i = 0; i < blocksW; i++) { for(uint32 i = 0; i < blocksW; i++) {
Block b; Block b;
b.SetColorA(imgA(i, j)); b.SetColorA(imgA(i, j), true);
b.SetColorB(imgB(i, j)); b.SetColorB(imgB(i, j), true);
for(uint32 t = 0; t < 16; t++) { for(uint32 t = 0; t < 16; t++) {
uint32 x = i + (t%4); uint32 x = i*4 + (t%4);
uint32 y = j + (t/4); uint32 y = j*4 + (t/4);
b.SetLerpValue(t, modValues[y*dcj.width + x]); b.SetLerpValue(t, modValues[y*dcj.width + x]);
} }
blocks.push_back(b.Pack()); blocks.push_back(b.Pack());
@ -321,9 +324,8 @@ namespace PVRTCC {
// linearize them... // linearize them...
uint32 idx = Interleave(j, i); uint32 idx = Interleave(j, i);
uint32 offset = idx * PVRTCC::kBlockSize; uint64 *outPtr = reinterpret_cast<uint64 *>(dcj.outBuf);
uint64 *outPtr = reinterpret_cast<uint64 *>(dcj.outBuf + offset); outPtr[idx] = blocks[j*blocksW + i];
*outPtr = blocks[j * blocksW + i];
} }
} }
} }