Merge GLM 0.9.8

This commit is contained in:
Christophe Riccio
2016-11-09 21:41:50 +01:00
2 changed files with 5 additions and 1 deletions

View File

@@ -54,12 +54,14 @@ namespace detail
return _mm_popcnt_u32(x);
}
# if(GLM_MODEL == GLM_MODEL_64)
template <>
GLM_FUNC_QUALIFIER int bitCount(uint64 x)
{
return static_cast<int>(_mm_popcnt_u64(x));
}
# endif
# endif//GLM_MODEL
# endif//GLM_ARCH
}//namespace glm