From 6b0c3b48ccbbb2e09972a4f535cdbe30a6fd4e8d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 9 Nov 2016 21:39:09 +0100 Subject: [PATCH] Fixed bitCount with AVX on 32 bit builds #567 --- glm/detail/func_integer_simd.inl | 4 +++- readme.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/glm/detail/func_integer_simd.inl b/glm/detail/func_integer_simd.inl index c79e8618..61758604 100644 --- a/glm/detail/func_integer_simd.inl +++ b/glm/detail/func_integer_simd.inl @@ -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(_mm_popcnt_u64(x)); } -# endif +# endif//GLM_MODEL +# endif//GLM_ARCH }//namespace glm diff --git a/readme.md b/readme.md index 95870e91..fbe4c582 100644 --- a/readme.md +++ b/readme.md @@ -59,6 +59,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Fixed Android build error with C++11 compiler but C++98 STL #284 #564 - Fixed GTX_transform2 shear* functions #403 - Fixed interaction between GLM_FORCE_UNRESTRICTED_GENTYPE and ortho function #568 +- Fixed bitCount with AVX on 32 bit builds #567 #### [GLM 0.9.8.2](https://github.com/g-truc/glm/releases/tag/0.9.8.2) - 2016-11-01 ##### Improvements: