Fixed test build on ICC

This commit is contained in:
Christophe Riccio 2014-11-15 13:19:35 +01:00
parent 3716995414
commit db4be24897

View File

@ -181,7 +181,7 @@ namespace bitfieldReverse
return bitfieldReverseLoop(glm::tvec1<T>(v)).x; return bitfieldReverseLoop(glm::tvec1<T>(v)).x;
} }
GLM_FUNC_QUALIFIER uint32_t bitfieldReverseUint32(uint32_t x) GLM_FUNC_QUALIFIER glm::uint32_t bitfieldReverseUint32(glm::uint32_t x)
{ {
x = (x & 0x55555555) << 1 | (x & 0xAAAAAAAA) >> 1; x = (x & 0x55555555) << 1 | (x & 0xAAAAAAAA) >> 1;
x = (x & 0x33333333) << 2 | (x & 0xCCCCCCCC) >> 2; x = (x & 0x33333333) << 2 | (x & 0xCCCCCCCC) >> 2;
@ -191,7 +191,7 @@ namespace bitfieldReverse
return x; return x;
} }
GLM_FUNC_QUALIFIER uint64_t bitfieldReverseUint64(uint64_t x) GLM_FUNC_QUALIFIER glm::uint64_t bitfieldReverseUint64(glm::uint64_t x)
{ {
x = (x & 0x5555555555555555) << 1 | (x & 0xAAAAAAAAAAAAAAAA) >> 1; x = (x & 0x5555555555555555) << 1 | (x & 0xAAAAAAAAAAAAAAAA) >> 1;
x = (x & 0x3333333333333333) << 2 | (x & 0xCCCCCCCCCCCCCCCC) >> 2; x = (x & 0x3333333333333333) << 2 | (x & 0xCCCCCCCCCCCCCCCC) >> 2;