mewin/glm
1
0
Fork 0
Code Releases Activity

Fixed 32-bits build #528 #529, fixed VC 32 bits crash

Browse Source
This commit is contained in:
Christophe Riccio
2016-08-07 12:42:45 +02:00
parent dcdc966969
commit f71171d49b
3 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
test/gtc/gtc_bitfield.cpp
View File

@@ -318,7 +318,7 @@ namespace bitfieldInterleave
return REG1 | (REG2 << 1);
}
/*
inline glm::uint64 loopBitfieldInterleave(glm::uint32 x, glm::uint32 y)
{
static glm::uint64 const Mask[5] =
@@ -340,7 +340,7 @@ namespace bitfieldInterleave
return REG1 | (REG2 << 1);
}
*/
#if(GLM_ARCH != GLM_ARCH_PURE)
inline glm::uint64 sseBitfieldInterleave(glm::uint32 x, glm::uint32 y)
{
@@ -467,11 +467,11 @@ namespace bitfieldInterleave
{
glm::uint64 A = glm::bitfieldInterleave(x, y);
glm::uint64 B = fastBitfieldInterleave(x, y);
glm::uint64 C = loopBitfieldInterleave(x, y);
//glm::uint64 C = loopBitfieldInterleave(x, y);
glm::uint64 D = interleaveBitfieldInterleave(x, y);
assert(A == B);
assert(A == C);
//assert(A == C);
assert(A == D);
# if GLM_ARCH & GLM_ARCH_SSE2_BIT
@@ -540,7 +540,7 @@ namespace bitfieldInterleave
std::printf("fastBitfieldInterleave Time %d clocks\n", static_cast<unsigned int>(Time));
}
/*
{
std::clock_t LastTime = std::clock();
@@ -551,7 +551,7 @@ namespace bitfieldInterleave
std::printf("loopBitfieldInterleave Time %d clocks\n", static_cast<unsigned int>(Time));
}
*/
{
std::clock_t LastTime = std::clock();