yuzu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2025-01-24 13:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the interleaving by doing it when we're actually reading in the blocks

Browse source
This commit is contained in:
Pavel Krajcevski 2013-09-06 01:55:06 -04:00
parent db914018f1
commit 2263080faa
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
PVRTCEncoder/src/Decompressor.cpp
View file

@ -105,7 +105,12 @@ namespace PVRTCC {
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++) {
uint32 offset = (j * blocksW + i) * blockSz;
// The blocks are initially arranged in morton order. Let's
// linearize them...
uint32 idx = Interleave(j, i);
uint32 offset = idx * blockSz;
blocks.push_back( Block(dcj.inBuf + offset) ); blocks.push_back( Block(dcj.inBuf + offset) );
} }
} }
@ -119,11 +124,7 @@ namespace PVRTCC {
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++) {
// The blocks are initially arranged in morton order. Let's uint32 idx = j * blocksW + i;
// linearize them... (yes I know there are faster algorithms
// to do this out there)
uint32 idx = Interleave(i, j);
// uint32 idx = j * blocksW + i;
assert(idx < static_cast<uint32>(blocks.size())); assert(idx < static_cast<uint32>(blocks.size()));
Block &b = blocks[idx]; Block &b = blocks[idx];