GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[basisu_astc] Fix the output stage for Big-Endian.

Browse Source 
This fixes the last failing test in ImageDecoderTest:

TCtest_ASTC/ImageDecoderTest.decodeTest/tctest_example_astc_dds_gz_Image,
	where GetParam() = tctest/example-astc.dds.gz
This commit is contained in:
David Korth 2022-09-10 15:46:59 -04:00
parent feb3b742a5
commit 699fa25ab3
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extlib/basisu_astc/_MODIFIED_BASISU.txt vendored
View File

@ -14,5 +14,7 @@ The following changes have been made to the original:
- Converted some large ternary comparison trees to switch/case.
- Proper byteswapping for Big-Endian architectures.
To obtain the original Basis Universal v1.15, visit:
https://github.com/BinomialLLC/basis_universal

14
extlib/basisu_astc/basisu_astc_decomp.cpp vendored
View File

@ -57,6 +57,9 @@ typedef uint64_t deUint64;
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
// rom-properties
#include "../../src/librpcpu/byteorder.h"
namespace basisu_astc
{
static bool inBounds(int v, int l, int h)
@ -1569,24 +1572,31 @@ bool decompress(uint8_t *pDst, const uint8_t * data, bool isSRGB, int blockWidth
// rg - We only support LDR here, although adding back in HDR would be easy.
const bool isLDR = true;
DE_ASSERT(isLDR || !isSRGB);
float linear[MAX_BLOCK_WIDTH * MAX_BLOCK_HEIGHT * 4];
const Block128 blockData(data);
if (decompressBlock(isSRGB ? (void*)pDst : (void*)& linear[0],
blockData, blockWidth, blockHeight, isSRGB, isLDR) != DECOMPRESS_RESULT_VALID_BLOCK)
return false;
if (!isSRGB)
{
const float *pLinear = linear;
for (int i = blockWidth * blockHeight; i > 0; i--, pDst += 4, pLinear += 4)
{
// NOTE: R and B are swapped for rom-properties.
#if SYS_BYTEORDER == SYS_LIL_ENDIAN
pDst[2] = (uint8_t)(basisu_astc::clamp<int>((int)(pLinear[0] * 65536.0f + .5f), 0, 65535) >> 8);
pDst[1] = (uint8_t)(basisu_astc::clamp<int>((int)(pLinear[1] * 65536.0f + .5f), 0, 65535) >> 8);
pDst[0] = (uint8_t)(basisu_astc::clamp<int>((int)(pLinear[2] * 65536.0f + .5f), 0, 65535) >> 8);
pDst[3] = (uint8_t)(basisu_astc::clamp<int>((int)(pLinear[3] * 65536.0f + .5f), 0, 65535) >> 8);
#else /* SYS_BYTEORDER == SYS_BIG_ENDIAN */
pDst[1] = (uint8_t)(basisu_astc::clamp<int>((int)(pLinear[0] * 65536.0f + .5f), 0, 65535) >> 8);
pDst[2] = (uint8_t)(basisu_astc::clamp<int>((int)(pLinear[1] * 65536.0f + .5f), 0, 65535) >> 8);
pDst[3] = (uint8_t)(basisu_astc::clamp<int>((int)(pLinear[2] * 65536.0f + .5f), 0, 65535) >> 8);
pDst[0] = (uint8_t)(basisu_astc::clamp<int>((int)(pLinear[3] * 65536.0f + .5f), 0, 65535) >> 8);
#endif
}
}