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 71967100..9ed8c140 100644 --- a/readme.md +++ b/readme.md @@ -79,6 +79,8 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) #### Fixes: - 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