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

Assert that our width and height are powers of two.

Browse source
This commit is contained in:
Pavel Krajcevski 2013-10-14 17:34:19 -04:00
parent 345292e36a
commit 0188006ce3
1 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
PVRTCEncoder/src/Compressor.cpp
View file

@ -148,10 +148,22 @@ namespace PVRTCC {
eExtremaResult_LocalMax eExtremaResult_LocalMax
}; };
#ifndef NDEBUG
template<typename T>
void AssertPOT(const T &t) {
assert(t & (t - 1) == 0);
}
#else
#define AssertPOT(x) (void)(0)
#endif
static EExtremaResult ComputeLocalExtrema( static EExtremaResult ComputeLocalExtrema(
CompressionLabel *labels, const uint8 *inBuf, CompressionLabel *labels, const uint8 *inBuf,
const uint32 x, const uint32 y, const uint32 width, const uint32 height) { const uint32 x, const uint32 y, const uint32 width, const uint32 height) {
AssertPOT(width);
AssertPOT(height);
assert(x < width); assert(x < width);
assert(y < height); assert(y < height);
@ -266,6 +278,10 @@ namespace PVRTCC {
static void LabelImageForward(CompressionLabel *labels, static void LabelImageForward(CompressionLabel *labels,
const uint8 *inBuf, const uint8 *inBuf,
const uint32 w, const uint32 h) { const uint32 w, const uint32 h) {
AssertPOT(w);
AssertPOT(h);
for(uint32 j = 0; j < h+3; j++) { for(uint32 j = 0; j < h+3; j++) {
for(uint32 i = 0; i < w; i++) { for(uint32 i = 0; i < w; i++) {
EExtremaResult result = ComputeLocalExtrema(labels, inBuf, i, j % h, w, h); EExtremaResult result = ComputeLocalExtrema(labels, inBuf, i, j % h, w, h);
@ -335,6 +351,10 @@ namespace PVRTCC {
static void LabelImageBackward(CompressionLabel *labels, static void LabelImageBackward(CompressionLabel *labels,
const uint32 w, const uint32 h) { const uint32 w, const uint32 h) {
AssertPOT(w);
AssertPOT(h);
CompressionLabel *neighbors[5] = { 0 }; CompressionLabel *neighbors[5] = { 0 };
for(int32 j = static_cast<int32>(h)+2; j >= 0; j--) { for(int32 j = static_cast<int32>(h)+2; j >= 0; j--) {
for(int32 i = static_cast<int32>(w)-1; i >= 0; i--) { for(int32 i = static_cast<int32>(w)-1; i >= 0; i--) {
@ -379,6 +399,8 @@ namespace PVRTCC {
const uint32 w, const uint32 h) { const uint32 w, const uint32 h) {
assert((w % 4) == 0); assert((w % 4) == 0);
assert((h % 4) == 0); assert((h % 4) == 0);
AssertPOT(w);
AssertPOT(h);
uint32 blocksW = w / 4; uint32 blocksW = w / 4;
uint32 blocksH = h / 4; uint32 blocksH = h / 4;
@ -526,6 +548,10 @@ namespace PVRTCC {
} }
static void GenerateModulationValues(uint8 *outBuf, const uint8 *inBuf, uint32 w, uint32 h) { static void GenerateModulationValues(uint8 *outBuf, const uint8 *inBuf, uint32 w, uint32 h) {
AssertPOT(w);
AssertPOT(h);
// Start from the beginning block and generate the lerp values for the intermediate values // Start from the beginning block and generate the lerp values for the intermediate values
uint64 *outBlocks = reinterpret_cast<uint64 *>(outBuf); uint64 *outBlocks = reinterpret_cast<uint64 *>(outBuf);
const uint32 blocksW = w >> 2; const uint32 blocksW = w >> 2;
@ -642,6 +668,10 @@ namespace PVRTCC {
const uint32 width = cj.width; const uint32 width = cj.width;
const uint32 height = cj.height; 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);
memset(cj.outBuf, 0, (width * height / 16) * kBlockSize); memset(cj.outBuf, 0, (width * height / 16) * kBlockSize);
CompressionLabel *labels = CompressionLabel *labels =