mewin/glm
1
0
Fork 0
Code Releases Activity

Merge branch '0.9.8'

Browse Source
This commit is contained in:
Christophe Riccio
2016-10-12 21:40:15 +02:00
parent a1c262e283 1c85265f97
commit 09a81dad23
10 changed files with 169 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/gtc/gtc_bitfield.cpp
View File

@@ -341,7 +341,7 @@ namespace bitfieldInterleave
return REG1 | (REG2 << 1);
}
*/
#if(GLM_ARCH != GLM_ARCH_PURE)
#if GLM_ARCH & GLM_ARCH_SSE2_BIT
inline glm::uint64 sseBitfieldInterleave(glm::uint32 x, glm::uint32 y)
{
GLM_ALIGN(16) glm::uint32 const Array[4] = {x, 0, y, 0};
@@ -457,7 +457,7 @@ namespace bitfieldInterleave
return Result[0];
}
#endif//(GLM_ARCH != GLM_ARCH_PURE)
#endif//GLM_ARCH & GLM_ARCH_SSE2_BIT
int test()
{
@@ -563,7 +563,7 @@ namespace bitfieldInterleave
std::printf("interleaveBitfieldInterleave Time %d clocks\n", static_cast<unsigned int>(Time));
}
# if(GLM_ARCH != GLM_ARCH_PURE)
# if GLM_ARCH & GLM_ARCH_SSE2_BIT
{
std::clock_t LastTime = std::clock();
@@ -585,7 +585,7 @@ namespace bitfieldInterleave
std::printf("sseUnalignedBitfieldInterleave Time %d clocks\n", static_cast<unsigned int>(Time));
}
# endif//(GLM_ARCH != GLM_ARCH_PURE)
# endif//GLM_ARCH & GLM_ARCH_SSE2_BIT
{
std::clock_t LastTime = std::clock();