Browse Source

Fixed bitCount with AVX on 32 bit builds #567

Christophe Riccio 9 years ago
parent
commit
6b0c3b48cc
2 changed files with 4 additions and 1 deletions
  1. 3 1
      glm/detail/func_integer_simd.inl
  2. 1 0
      readme.md

+ 3 - 1
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<int>(_mm_popcnt_u64(x));
 	}
-#	endif
+#	endif//GLM_MODEL
+#	endif//GLM_ARCH
 
 }//namespace glm
 

+ 1 - 0
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: