From 35b352168afecf52efc36104bd457350f3d0663c Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 30 Sep 2011 13:47:38 +0100 Subject: [PATCH 1/5] Fixed revision number --- glm/core/setup.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index e3a569ec..5babcd95 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -17,7 +17,7 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 2 -#define GLM_VERSION_REVISION 3 +#define GLM_VERSION_REVISION 6 /////////////////////////////////////////////////////////////////////////////////////////////////// // Compiler From 2438ec04b1b922b1cd161ea0d798aedf7d4a59fd Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 30 Sep 2011 13:57:09 +0100 Subject: [PATCH 2/5] Ticket #129, fixed -Wsign-conversion warnings --- glm/core/type_half.inl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/glm/core/type_half.inl b/glm/core/type_half.inl index 8166a75e..c6f90301 100644 --- a/glm/core/type_half.inl +++ b/glm/core/type_half.inl @@ -41,7 +41,7 @@ namespace detail // detail::uif result; - result.i = s << 31; + result.i = (unsigned int)(s << 31); return result.f; } else @@ -69,7 +69,7 @@ namespace detail // uif result; - result.i = (s << 31) | 0x7f800000; + result.i = (unsigned int)((s << 31) | 0x7f800000); return result.f; } else @@ -79,7 +79,7 @@ namespace detail // uif result; - result.i = (s << 31) | 0x7f800000 | (m << 13); + result.i = (unsigned int)((s << 31) | 0x7f800000 | (m << 13)); return result.f; } } @@ -96,7 +96,7 @@ namespace detail // uif Result; - Result.i = (s << 31) | (e << 23) | m; + Result.i = (unsigned int)((s << 31) | (e << 23) | m); return Result.f; } @@ -104,7 +104,7 @@ namespace detail { uif Entry; Entry.f = f; - int i = Entry.i; + int i = (int)Entry.i; // // Our floating point number, f, is represented by the bit From 3def64b49b76ca474034b64980797f3e59f18ed4 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 30 Sep 2011 14:14:21 +0100 Subject: [PATCH 3/5] Fixed matrix division --- glm/gtx/simd_mat4.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtx/simd_mat4.inl b/glm/gtx/simd_mat4.inl index 84771b65..3bbadf13 100644 --- a/glm/gtx/simd_mat4.inl +++ b/glm/gtx/simd_mat4.inl @@ -157,7 +157,7 @@ namespace detail ) { __m128 Inv[4]; - sse_inverse_ps(&this->Data[0].Data, Inv); + sse_inverse_ps(&m.Data[0].Data, Inv); sse_mul_ps(&this->Data[0].Data, Inv, &this->Data[0].Data); return *this; } From ac8552d2967f6acb8fc9d429394b69a1a4c109cd Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 30 Sep 2011 14:37:49 +0100 Subject: [PATCH 4/5] Fixed /W4 VC warnings --- glm/core/intrinsic_common.inl | 5 +++++ glm/gtx/ulp.inl | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/glm/core/intrinsic_common.inl b/glm/core/intrinsic_common.inl index 471769fa..12c9023f 100644 --- a/glm/core/intrinsic_common.inl +++ b/glm/core/intrinsic_common.inl @@ -10,6 +10,9 @@ namespace glm{ namespace detail{ +#pragma warning(push) +#pragma warning(disable : 4510 4512 4610) + union ieee754_QNAN { const float f; @@ -21,6 +24,8 @@ namespace detail{ ieee754_QNAN() : f(0.0)/*, mantissa(0x7FFFFF), exp(0xFF), sign(0x0)*/ {} }; +#pragma warning(pop) + static const __m128 GLM_VAR_USED zero = _mm_setzero_ps(); static const __m128 GLM_VAR_USED one = _mm_set_ps1(1.0f); static const __m128 GLM_VAR_USED minus_one = _mm_set_ps1(-1.0f); diff --git a/glm/gtx/ulp.inl b/glm/gtx/ulp.inl index 41a4bd9b..a0c53bef 100644 --- a/glm/gtx/ulp.inl +++ b/glm/gtx/ulp.inl @@ -21,6 +21,9 @@ * ==================================================== */ +#pragma warning(push) +#pragma warning(disable : 4127) + typedef union { float value; @@ -168,6 +171,8 @@ namespace detail }//namespace detail }//namespace glm +#pragma warning(pop) + #if(GLM_COMPILER & GLM_COMPILER_VC) # define GLM_NEXT_AFTER_FLT(x, toward) glm::detail::nextafterf((x), (toward)) # define GLM_NEXT_AFTER_DBL(x, toward) _nextafter((x), (toward)) From 21942860b96d362384ebf3ed862abe6f6b450cbb Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Fri, 30 Sep 2011 14:52:27 +0100 Subject: [PATCH 5/5] updated readme for release --- readme.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/readme.txt b/readme.txt index a0497392..69019670 100644 --- a/readme.txt +++ b/readme.txt @@ -36,6 +36,12 @@ GLM is a header only library, there is nothing to build, just include it. More informations in GLM manual: http://glm.g-truc.net/glm-0.9.2.pdf +================================================================================ +GLM 0.9.2.6: 2011-10-01 +-------------------------------------------------------------------------------- +- Fixed half based type build on old GCC +- Fixed /W4 warnings on Visual C++ + ================================================================================ GLM 0.9.2.5: 2011-09-20 --------------------------------------------------------------------------------