Dima353/openal-soft
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use templates unnecessarily

Browse Source
This commit is contained in:
Chris Robinson
2021-01-01 15:35:14 -08:00
parent 87a862199d
commit 1327aca9d7
1 changed files with 0 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/alnumeric.h
-19
View File
@@ -107,28 +107,17 @@ inline size_t RoundUp(size_t value, size_t r) noexcept
* and PopCount (population count/count 1 bits) methods, for 32- and 64-bit * and PopCount (population count/count 1 bits) methods, for 32- and 64-bit
* integers. The CountTrailingZeros results are *UNDEFINED* if the value is 0. * integers. The CountTrailingZeros results are *UNDEFINED* if the value is 0.
*/ */
template<typename T>
inline int PopCount(T val) = delete;
template<typename T>
inline int CountTrailingZeros(T val) = delete;
#ifdef __GNUC__ #ifdef __GNUC__
/* Define variations for unsigned (long (long)) int, since we don't know what /* Define variations for unsigned (long (long)) int, since we don't know what
* uint32/64_t are typedef'd to. * uint32/64_t are typedef'd to.
*/ */
template<>
inline int PopCount(unsigned long long val) { return __builtin_popcountll(val); } inline int PopCount(unsigned long long val) { return __builtin_popcountll(val); }
template<>
inline int PopCount(unsigned long val) { return __builtin_popcountl(val); } inline int PopCount(unsigned long val) { return __builtin_popcountl(val); }
template<>
inline int PopCount(unsigned int val) { return __builtin_popcount(val); } inline int PopCount(unsigned int val) { return __builtin_popcount(val); }
template<>
inline int CountTrailingZeros(unsigned long long val) { return __builtin_ctzll(val); } inline int CountTrailingZeros(unsigned long long val) { return __builtin_ctzll(val); }
template<>
inline int CountTrailingZeros(unsigned long val) { return __builtin_ctzl(val); } inline int CountTrailingZeros(unsigned long val) { return __builtin_ctzl(val); }
template<>
inline int CountTrailingZeros(unsigned int val) { return __builtin_ctz(val); } inline int CountTrailingZeros(unsigned int val) { return __builtin_ctz(val); }
#else #else
@@ -140,7 +129,6 @@ inline int CountTrailingZeros(unsigned int val) { return __builtin_ctz(val); }
* as the ntz2 variant. These likely aren't the most efficient methods, but * as the ntz2 variant. These likely aren't the most efficient methods, but
* they're good enough if the GCC built-ins aren't available. * they're good enough if the GCC built-ins aren't available.
*/ */
template<>
inline int PopCount(uint32_t v) inline int PopCount(uint32_t v)
{ {
v = v - ((v >> 1) & 0x55555555u); v = v - ((v >> 1) & 0x55555555u);
@@ -148,7 +136,6 @@ inline int PopCount(uint32_t v)
v = (v + (v >> 4)) & 0x0f0f0f0fu; v = (v + (v >> 4)) & 0x0f0f0f0fu;
return static_cast<int>((v * 0x01010101u) >> 24); return static_cast<int>((v * 0x01010101u) >> 24);
} }
template<>
inline int PopCount(uint64_t v) inline int PopCount(uint64_t v)
{ {
v = v - ((v >> 1) & 0x5555555555555555_u64); v = v - ((v >> 1) & 0x5555555555555555_u64);
@@ -159,14 +146,12 @@ inline int PopCount(uint64_t v)
#if defined(_WIN64) #if defined(_WIN64)
template<>
inline int CountTrailingZeros(uint32_t v) inline int CountTrailingZeros(uint32_t v)
{ {
unsigned long idx = 32; unsigned long idx = 32;
_BitScanForward(&idx, v); _BitScanForward(&idx, v);
return static_cast<int>(idx); return static_cast<int>(idx);
} }
template<>
inline int CountTrailingZeros(uint64_t v) inline int CountTrailingZeros(uint64_t v)
{ {
unsigned long idx = 64; unsigned long idx = 64;
@@ -176,14 +161,12 @@ inline int CountTrailingZeros(uint64_t v)
#elif defined(_WIN32) #elif defined(_WIN32)
template<>
inline int CountTrailingZeros(uint32_t v) inline int CountTrailingZeros(uint32_t v)
{ {
unsigned long idx = 32; unsigned long idx = 32;
_BitScanForward(&idx, v); _BitScanForward(&idx, v);
return static_cast<int>(idx); return static_cast<int>(idx);
} }
template<>
inline int CountTrailingZeros(uint64_t v) inline int CountTrailingZeros(uint64_t v)
{ {
unsigned long idx = 64; unsigned long idx = 64;
@@ -197,10 +180,8 @@ inline int CountTrailingZeros(uint64_t v)
#else #else
template<>
inline int CountTrailingZeros(uint32_t value) inline int CountTrailingZeros(uint32_t value)
{ return PopCount(~value & (value - 1)); } { return PopCount(~value & (value - 1)); }
template<>
inline int CountTrailingZeros(uint64_t value) inline int CountTrailingZeros(uint64_t value)
{ return PopCount(~value & (value - 1)); } { return PopCount(~value & (value - 1)); }