AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

TXTR: Mark constexpr functions static 

Same behavior, but makes them internally linked.
This commit is contained in:
Lioncash 2020-03-31 20:36:42 -04:00
parent d3295cbb87
commit 11c40415f5
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
DataSpec/DNACommon/TXTR.cpp
View File

@ -69,33 +69,33 @@ static size_t ComputeMippedTexelCount(unsigned inWidth, unsigned inHeight) {
} }
/* GX uses this upsampling technique to extract full 8-bit range */ /* GX uses this upsampling technique to extract full 8-bit range */
constexpr uint8_t Convert3To8(uint8_t v) { static constexpr uint8_t Convert3To8(uint8_t v) {
/* Swizzle bits: 00000123 -> 12312312 */ /* Swizzle bits: 00000123 -> 12312312 */
return (v << 5) | (v << 2) | (v >> 1); return (v << 5) | (v << 2) | (v >> 1);
} }
constexpr uint8_t Convert8To3(uint8_t v) { return v >> 5; } static constexpr uint8_t Convert8To3(uint8_t v) { return v >> 5; }
constexpr uint8_t Convert4To8(uint8_t v) { static constexpr uint8_t Convert4To8(uint8_t v) {
/* Swizzle bits: 00001234 -> 12341234 */ /* Swizzle bits: 00001234 -> 12341234 */
return (v << 4) | v; return (v << 4) | v;
} }
constexpr uint8_t Convert8To4(uint8_t v) { return v >> 4; } static constexpr uint8_t Convert8To4(uint8_t v) { return v >> 4; }
constexpr uint8_t Convert5To8(uint8_t v) { static constexpr uint8_t Convert5To8(uint8_t v) {
/* Swizzle bits: 00012345 -> 12345123 */ /* Swizzle bits: 00012345 -> 12345123 */
return (v << 3) | (v >> 2); return (v << 3) | (v >> 2);
} }
constexpr uint8_t Convert8To5(uint8_t v) { return v >> 3; } static constexpr uint8_t Convert8To5(uint8_t v) { return v >> 3; }
constexpr uint8_t Convert6To8(uint8_t v) { static constexpr uint8_t Convert6To8(uint8_t v) {
/* Swizzle bits: 00123456 -> 12345612 */ /* Swizzle bits: 00123456 -> 12345612 */
return (v << 2) | (v >> 4); return (v << 2) | (v >> 4);
} }
constexpr uint8_t Convert8To6(uint8_t v) { return v >> 2; } static constexpr uint8_t Convert8To6(uint8_t v) { return v >> 2; }
static uint8_t Lookup4BPP(const uint8_t* texels, int width, int x, int y) { static uint8_t Lookup4BPP(const uint8_t* texels, int width, int x, int y) {
const int bwidth = (width + 7) / 8; const int bwidth = (width + 7) / 8;