From 282473be2497c718f026180c6cbe54e006d561c5 Mon Sep 17 00:00:00 2001 From: Patrik Huber Date: Mon, 7 Nov 2016 21:41:43 +0000 Subject: [PATCH 1/5] Fixed missing conversion to T --- glm/gtc/matrix_transform.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index dac55a4a..21669c7d 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -168,7 +168,7 @@ namespace glm T bottom, T top ) { - tmat4x4 Result(1); + tmat4x4 Result(T(1)); Result[0][0] = static_cast(2) / (right - left); Result[1][1] = static_cast(2) / (top - bottom); Result[2][2] = - static_cast(1); From 80390afd82792973601bb5a3a08afe09706b521e Mon Sep 17 00:00:00 2001 From: Patrik Huber Date: Tue, 8 Nov 2016 11:27:32 +0000 Subject: [PATCH 2/5] Changed T() to static_cast --- glm/gtc/matrix_transform.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtc/matrix_transform.inl b/glm/gtc/matrix_transform.inl index 21669c7d..b9ff418b 100644 --- a/glm/gtc/matrix_transform.inl +++ b/glm/gtc/matrix_transform.inl @@ -168,7 +168,7 @@ namespace glm T bottom, T top ) { - tmat4x4 Result(T(1)); + tmat4x4 Result(static_cast(1)); Result[0][0] = static_cast(2) / (right - left); Result[1][1] = static_cast(2) / (top - bottom); Result[2][2] = - static_cast(1); From c87e9bed0da23bf043dc9c49d586518f21b02c1f Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 9 Nov 2016 21:21:09 +0100 Subject: [PATCH 3/5] Updated revision number --- glm/detail/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 610c7473..174a41b9 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -36,7 +36,7 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 8 -#define GLM_VERSION_REVISION 2 +#define GLM_VERSION_REVISION 3 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_VERSION_DISPLAYED) # define GLM_MESSAGE_VERSION_DISPLAYED From 30db341ed882071333df5781dd455395a619ec40 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 9 Nov 2016 21:23:17 +0100 Subject: [PATCH 4/5] - Fixed interaction between GLM_FORCE_UNRESTRICTED_GENTYPE and ortho function #568 --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index aba6b1f6..95870e91 100644 --- a/readme.md +++ b/readme.md @@ -58,6 +58,7 @@ 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 #### [GLM 0.9.8.2](https://github.com/g-truc/glm/releases/tag/0.9.8.2) - 2016-11-01 ##### Improvements: From 6b0c3b48ccbbb2e09972a4f535cdbe30a6fd4e8d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 9 Nov 2016 21:39:09 +0100 Subject: [PATCH 5/5] 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: