From 28aba540ee8d02ab384639dc16c05d7fb008243e Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 1 Dec 2014 20:27:56 +0100 Subject: [PATCH 01/11] Fixed scalar uaddCarry build error with Cuda #276 --- glm/detail/func_integer.inl | 2 +- readme.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl index f84304e5..cc1c4d33 100644 --- a/glm/detail/func_integer.inl +++ b/glm/detail/func_integer.inl @@ -203,7 +203,7 @@ namespace detail GLM_FUNC_QUALIFIER uint uaddCarry(uint const & x, uint const & y, uint & Carry) { uint64 const Value64(static_cast(x) + static_cast(y)); - uint64 const Max32(static_cast(std::numeric_limits::max())); + uint64 const Max32((static_cast(1) << static_cast(32)) - static_cast(1)); Carry = Value64 > Max32 ? 1 : 0; return static_cast(Value64 % (Max32 + static_cast(1))); } diff --git a/readme.txt b/readme.txt index b3cdcd76..cd2bb67d 100644 --- a/readme.txt +++ b/readme.txt @@ -62,6 +62,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.pdf +================================================================================ +GLM 0.9.6.1: 2014-12-XX +-------------------------------------------------------------------------------- +Fixes: +- Fixed uaddCarry error for Cuda build #276 + ================================================================================ GLM 0.9.6.0: 2014-11-30 -------------------------------------------------------------------------------- From 09083fef056ee12e727e1262e2c649f819a4ac96 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 2 Dec 2014 20:48:26 +0100 Subject: [PATCH 02/11] Added more log2 tests --- readme.txt | 2 +- test/gtc/gtc_integer.cpp | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index cd2bb67d..fec7dd1c 100644 --- a/readme.txt +++ b/readme.txt @@ -66,7 +66,7 @@ http://glm.g-truc.net/glm.pdf GLM 0.9.6.1: 2014-12-XX -------------------------------------------------------------------------------- Fixes: -- Fixed uaddCarry error for Cuda build #276 +- Fixed scalar uaddCarry build error with Cuda #276 ================================================================================ GLM 0.9.6.0: 2014-11-30 diff --git a/test/gtc/gtc_integer.cpp b/test/gtc/gtc_integer.cpp index b306b843..7c2099bd 100644 --- a/test/gtc/gtc_integer.cpp +++ b/test/gtc/gtc_integer.cpp @@ -67,6 +67,18 @@ namespace log2_ Error += glm::all(glm::equal(D0, D1)) ? 0 : 1; Error += glm::all(glm::equal(E0, E1)) ? 0 : 1; + glm::uint64 A2 = glm::log2(glm::uint64(10.f)); + glm::u64vec1 B2 = glm::log2(glm::u64vec1(10.f)); + glm::u64vec2 C2 = glm::log2(glm::u64vec2(10.f)); + glm::u64vec3 D2 = glm::log2(glm::u64vec3(10.f)); + glm::u64vec4 E2 = glm::log2(glm::u64vec4(10.f)); + + Error += A2 == glm::uint64(1) ? 0 : 1; + Error += glm::all(glm::equal(B2, glm::u64vec1(1))) ? 0 : 1; + Error += glm::all(glm::equal(C2, glm::u64vec2(1))) ? 0 : 1; + Error += glm::all(glm::equal(D2, glm::u64vec3(1))) ? 0 : 1; + Error += glm::all(glm::equal(E2, glm::u64vec4(1))) ? 0 : 1; + return Error; } From 6a1a673b4176752875bcc7457d9f35246d1a3272 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 3 Dec 2014 14:55:47 +0100 Subject: [PATCH 03/11] Fixed C++11 explicit conversion operators detection #282 --- glm/detail/setup.hpp | 8 ++++++++ glm/gtc/quaternion.hpp | 6 ++++-- readme.txt | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 0148f5f9..e2f65e88 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -506,6 +506,14 @@ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC43)) || \ __has_feature(cxx_rvalue_references)) +// N2437 +#define GLM_HAS_EXPLICIT_CONVERSION_OPERATORS ( \ + (GLM_LANG & GLM_LANG_CXX11_FLAG) || \ + ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013))) || \ + ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14))) || \ + ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC45)) || \ + __has_feature(cxx_explicit_conversions) + #define GLM_HAS_STL_ARRAY ( \ (GLM_LANG & GLM_LANG_CXX11_FLAG) || \ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2010))) || \ diff --git a/glm/gtc/quaternion.hpp b/glm/gtc/quaternion.hpp index 15372cd0..0230bacf 100644 --- a/glm/gtc/quaternion.hpp +++ b/glm/gtc/quaternion.hpp @@ -113,8 +113,10 @@ namespace glm # endif // explicit conversion operators - GLM_FUNC_DECL explicit operator tmat3x3(); - GLM_FUNC_DECL explicit operator tmat4x4(); +# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS + GLM_FUNC_DECL explicit operator tmat3x3(); + GLM_FUNC_DECL explicit operator tmat4x4(); +# endif /// Create a quaternion from two normalized axis /// diff --git a/readme.txt b/readme.txt index fec7dd1c..97a40c66 100644 --- a/readme.txt +++ b/readme.txt @@ -67,6 +67,7 @@ GLM 0.9.6.1: 2014-12-XX -------------------------------------------------------------------------------- Fixes: - Fixed scalar uaddCarry build error with Cuda #276 +- Fixed C++11 explicit conversion operators detection #282 ================================================================================ GLM 0.9.6.0: 2014-11-30 From 38d99978abc700e09c520ab99dca6d54c4f9306b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 3 Dec 2014 21:48:41 +0100 Subject: [PATCH 04/11] Fixed C++11 explicit conversion operators detection #282 --- glm/detail/setup.hpp | 2 +- glm/gtc/quaternion.inl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index e2f65e88..a32406d5 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -512,7 +512,7 @@ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013))) || \ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14))) || \ ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC45)) || \ - __has_feature(cxx_explicit_conversions) + __has_feature(cxx_explicit_conversions)) #define GLM_HAS_STL_ARRAY ( \ (GLM_LANG & GLM_LANG_CXX11_FLAG) || \ diff --git a/glm/gtc/quaternion.inl b/glm/gtc/quaternion.inl index d9615ce1..3eb598ce 100644 --- a/glm/gtc/quaternion.inl +++ b/glm/gtc/quaternion.inl @@ -190,7 +190,8 @@ namespace detail { *this = quat_cast(m); } - + +# if GLM_HAS_EXPLICIT_CONVERSION_OPERATORS template GLM_FUNC_QUALIFIER tquat::operator tmat3x3() { @@ -202,6 +203,7 @@ namespace detail { return mat4_cast(*this); } +# endif//GLM_HAS_EXPLICIT_CONVERSION_OPERATORS template GLM_FUNC_QUALIFIER tquat conjugate(tquat const & q) From f026e722ee210b45f0c77e6def7113551efdc058 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Wed, 3 Dec 2014 23:23:24 +0100 Subject: [PATCH 05/11] Fixed missing explicit convertion when using integer log2 with *vec1 types --- glm/gtc/integer.inl | 2 +- readme.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/glm/gtc/integer.inl b/glm/gtc/integer.inl index 5a23f0b2..c7bb36d8 100644 --- a/glm/gtc/integer.inl +++ b/glm/gtc/integer.inl @@ -40,7 +40,7 @@ namespace detail { //Equivalent to return findMSB(vec); but save one function call in ASM with VC //return findMSB(vec); - return detail::compute_findMSB_vec::call(vec); + return vecType(detail::compute_findMSB_vec::call(vec)); } }; diff --git a/readme.txt b/readme.txt index 97a40c66..5027ddff 100644 --- a/readme.txt +++ b/readme.txt @@ -68,6 +68,7 @@ GLM 0.9.6.1: 2014-12-XX Fixes: - Fixed scalar uaddCarry build error with Cuda #276 - Fixed C++11 explicit conversion operators detection #282 +- Fixed missing explicit convertion when using integer log2 with *vec1 types ================================================================================ GLM 0.9.6.0: 2014-11-30 From bd2601f12a223ba310de41269fcf88b0cb41d829 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 4 Dec 2014 00:27:49 +0100 Subject: [PATCH 06/11] Removed warnings --- test/gtc/gtc_integer.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/gtc/gtc_integer.cpp b/test/gtc/gtc_integer.cpp index 7c2099bd..7c00c314 100644 --- a/test/gtc/gtc_integer.cpp +++ b/test/gtc/gtc_integer.cpp @@ -49,17 +49,17 @@ namespace log2_ { int Error = 0; - int A0(glm::log2(10.f)); + int A0 = static_cast(glm::log2(10.f)); glm::ivec1 B0(glm::log2(glm::vec1(10.f))); glm::ivec2 C0(glm::log2(glm::vec2(10.f))); glm::ivec3 D0(glm::log2(glm::vec3(10.f))); glm::ivec4 E0(glm::log2(glm::vec4(10.f))); - int A1 = glm::log2(int(10.f)); - glm::ivec1 B1 = glm::log2(glm::ivec1(10.f)); - glm::ivec2 C1 = glm::log2(glm::ivec2(10.f)); - glm::ivec3 D1 = glm::log2(glm::ivec3(10.f)); - glm::ivec4 E1 = glm::log2(glm::ivec4(10.f)); + int A1 = glm::log2(int(10)); + glm::ivec1 B1 = glm::log2(glm::ivec1(10)); + glm::ivec2 C1 = glm::log2(glm::ivec2(10)); + glm::ivec3 D1 = glm::log2(glm::ivec3(10)); + glm::ivec4 E1 = glm::log2(glm::ivec4(10)); Error += A0 == A1 ? 0 : 1; Error += glm::all(glm::equal(B0, B1)) ? 0 : 1; @@ -67,11 +67,11 @@ namespace log2_ Error += glm::all(glm::equal(D0, D1)) ? 0 : 1; Error += glm::all(glm::equal(E0, E1)) ? 0 : 1; - glm::uint64 A2 = glm::log2(glm::uint64(10.f)); - glm::u64vec1 B2 = glm::log2(glm::u64vec1(10.f)); - glm::u64vec2 C2 = glm::log2(glm::u64vec2(10.f)); - glm::u64vec3 D2 = glm::log2(glm::u64vec3(10.f)); - glm::u64vec4 E2 = glm::log2(glm::u64vec4(10.f)); + glm::uint64 A2 = glm::log2(glm::uint64(10)); + glm::u64vec1 B2 = glm::log2(glm::u64vec1(10)); + glm::u64vec2 C2 = glm::log2(glm::u64vec2(10)); + glm::u64vec3 D2 = glm::log2(glm::u64vec3(10)); + glm::u64vec4 E2 = glm::log2(glm::u64vec4(10)); Error += A2 == glm::uint64(1) ? 0 : 1; Error += glm::all(glm::equal(B2, glm::u64vec1(1))) ? 0 : 1; @@ -93,7 +93,7 @@ namespace log2_ std::clock_t Begin = clock(); - for(std::size_t i = 0; i < Count; ++i) + for(int i = 0; i < static_cast(Count); ++i) Result[i] = glm::log2(static_cast(i)); std::clock_t End = clock(); @@ -107,7 +107,7 @@ namespace log2_ std::clock_t Begin = clock(); - for(std::size_t i = 0; i < Count; ++i) + for(int i = 0; i < static_cast(Count); ++i) Result[i] = glm::log2(glm::ivec4(i)); std::clock_t End = clock(); @@ -198,7 +198,7 @@ namespace log2_ std::clock_t Begin = clock(); - for(std::size_t i = 0; i < Count; ++i) + for(int i = 0; i < static_cast(Count); ++i) Result[i] = glm::log2(glm::vec4(i)); std::clock_t End = clock(); From e1a9702097cb12c611fb5003626d4a136c67c4e3 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 4 Dec 2014 22:47:30 +0100 Subject: [PATCH 07/11] Fixed GTC_integer test --- test/gtc/gtc_integer.cpp | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/test/gtc/gtc_integer.cpp b/test/gtc/gtc_integer.cpp index 7c00c314..c63e84fd 100644 --- a/test/gtc/gtc_integer.cpp +++ b/test/gtc/gtc_integer.cpp @@ -49,17 +49,17 @@ namespace log2_ { int Error = 0; - int A0 = static_cast(glm::log2(10.f)); - glm::ivec1 B0(glm::log2(glm::vec1(10.f))); - glm::ivec2 C0(glm::log2(glm::vec2(10.f))); - glm::ivec3 D0(glm::log2(glm::vec3(10.f))); - glm::ivec4 E0(glm::log2(glm::vec4(10.f))); + int A0 = static_cast(glm::log2(16.f)); + glm::ivec1 B0(glm::log2(glm::vec1(16.f))); + glm::ivec2 C0(glm::log2(glm::vec2(16.f))); + glm::ivec3 D0(glm::log2(glm::vec3(16.f))); + glm::ivec4 E0(glm::log2(glm::vec4(16.f))); - int A1 = glm::log2(int(10)); - glm::ivec1 B1 = glm::log2(glm::ivec1(10)); - glm::ivec2 C1 = glm::log2(glm::ivec2(10)); - glm::ivec3 D1 = glm::log2(glm::ivec3(10)); - glm::ivec4 E1 = glm::log2(glm::ivec4(10)); + int A1 = glm::log2(int(16)); + glm::ivec1 B1 = glm::log2(glm::ivec1(16)); + glm::ivec2 C1 = glm::log2(glm::ivec2(16)); + glm::ivec3 D1 = glm::log2(glm::ivec3(16)); + glm::ivec4 E1 = glm::log2(glm::ivec4(16)); Error += A0 == A1 ? 0 : 1; Error += glm::all(glm::equal(B0, B1)) ? 0 : 1; @@ -67,17 +67,17 @@ namespace log2_ Error += glm::all(glm::equal(D0, D1)) ? 0 : 1; Error += glm::all(glm::equal(E0, E1)) ? 0 : 1; - glm::uint64 A2 = glm::log2(glm::uint64(10)); - glm::u64vec1 B2 = glm::log2(glm::u64vec1(10)); - glm::u64vec2 C2 = glm::log2(glm::u64vec2(10)); - glm::u64vec3 D2 = glm::log2(glm::u64vec3(10)); - glm::u64vec4 E2 = glm::log2(glm::u64vec4(10)); + glm::uint64 A2 = glm::log2(glm::uint64(16)); + glm::u64vec1 B2 = glm::log2(glm::u64vec1(16)); + glm::u64vec2 C2 = glm::log2(glm::u64vec2(16)); + glm::u64vec3 D2 = glm::log2(glm::u64vec3(16)); + glm::u64vec4 E2 = glm::log2(glm::u64vec4(16)); - Error += A2 == glm::uint64(1) ? 0 : 1; - Error += glm::all(glm::equal(B2, glm::u64vec1(1))) ? 0 : 1; - Error += glm::all(glm::equal(C2, glm::u64vec2(1))) ? 0 : 1; - Error += glm::all(glm::equal(D2, glm::u64vec3(1))) ? 0 : 1; - Error += glm::all(glm::equal(E2, glm::u64vec4(1))) ? 0 : 1; + Error += A2 == glm::uint64(4) ? 0 : 1; + Error += glm::all(glm::equal(B2, glm::u64vec1(4))) ? 0 : 1; + Error += glm::all(glm::equal(C2, glm::u64vec2(4))) ? 0 : 1; + Error += glm::all(glm::equal(D2, glm::u64vec3(4))) ? 0 : 1; + Error += glm::all(glm::equal(E2, glm::u64vec4(4))) ? 0 : 1; return Error; } From bcf1a723928c5a8b73d5e2241612f298b3d6fcf1 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 8 Dec 2014 21:45:14 +0100 Subject: [PATCH 08/11] Fixed libc++ detection #284 --- glm/detail/setup.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index a32406d5..42b6beee 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -453,9 +453,11 @@ // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx // N1720 -#define GLM_HAS_CXX11_STL ( \ - (GLM_LANG & GLM_LANG_CXX11_FLAG) || \ - ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015))) +#if GLM_COMPILER & GLM_COMPILER_CLANG +# define GLM_HAS_CXX11_STL (GLM_LANG & GLM_LANG_CXX11_FLAG) && __has_include(<__config>) +#else +# define GLM_HAS_CXX11_STL (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015) +#endif // N1720 #define GLM_HAS_STATIC_ASSERT ( \ From c1180c804c75aa10c101293cf7ca57a461fde500 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 1 Dec 2014 01:12:03 +0100 Subject: [PATCH 09/11] New organization idea for SIMD support --- glm/detail/type_vec4.inl | 10 +++++++++ glm/detail/type_vec4_avx.inl | 41 +++++++++++++++++++++++++++++++++++ glm/detail/type_vec4_avx2.inl | 41 +++++++++++++++++++++++++++++++++++ glm/detail/type_vec4_sse2.inl | 41 +++++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+) create mode 100644 glm/detail/type_vec4_avx.inl create mode 100644 glm/detail/type_vec4_avx2.inl create mode 100644 glm/detail/type_vec4_sse2.inl diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index f14b9cf2..6509efb8 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -1187,3 +1187,13 @@ namespace glm ~v.w); } }//namespace glm + +#if GLM_ARCH & GLM_ARCH_SSE2 +# include "type_vec4_sse2.inl" +#endif +#if GLM_ARCH & GLM_ARCH_AVX +# include "type_vec4_avx.inl" +#endif +#if GLM_ARCH & GLM_ARCH_AVX2 +# include "type_vec4_avx2.inl" +#endif diff --git a/glm/detail/type_vec4_avx.inl b/glm/detail/type_vec4_avx.inl new file mode 100644 index 00000000..509f6675 --- /dev/null +++ b/glm/detail/type_vec4_avx.inl @@ -0,0 +1,41 @@ +/////////////////////////////////////////////////////////////////////////////////// +/// OpenGL Mathematics (glm.g-truc.net) +/// +/// Copyright (c) 2005 - 2014 G-Truc Creation (www.g-truc.net) +/// Permission is hereby granted, free of charge, to any person obtaining a copy +/// of this software and associated documentation files (the "Software"), to deal +/// in the Software without restriction, including without limitation the rights +/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +/// copies of the Software, and to permit persons to whom the Software is +/// furnished to do so, subject to the following conditions: +/// +/// The above copyright notice and this permission notice shall be included in +/// all copies or substantial portions of the Software. +/// +/// Restrictions: +/// By making use of the Software for military purposes, you choose to make +/// a Bunny unhappy. +/// +/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +/// THE SOFTWARE. +/// +/// @ref core +/// @file glm/detail/type_tvec4_avx.inl +/// @date 2014-12-01 / 2014-12-01 +/// @author Christophe Riccio +/////////////////////////////////////////////////////////////////////////////////// + +namespace glm{ +namespace detail +{ + +}//namespace detail + + + +}//namespace glm diff --git a/glm/detail/type_vec4_avx2.inl b/glm/detail/type_vec4_avx2.inl new file mode 100644 index 00000000..28232504 --- /dev/null +++ b/glm/detail/type_vec4_avx2.inl @@ -0,0 +1,41 @@ +/////////////////////////////////////////////////////////////////////////////////// +/// OpenGL Mathematics (glm.g-truc.net) +/// +/// Copyright (c) 2005 - 2014 G-Truc Creation (www.g-truc.net) +/// Permission is hereby granted, free of charge, to any person obtaining a copy +/// of this software and associated documentation files (the "Software"), to deal +/// in the Software without restriction, including without limitation the rights +/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +/// copies of the Software, and to permit persons to whom the Software is +/// furnished to do so, subject to the following conditions: +/// +/// The above copyright notice and this permission notice shall be included in +/// all copies or substantial portions of the Software. +/// +/// Restrictions: +/// By making use of the Software for military purposes, you choose to make +/// a Bunny unhappy. +/// +/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +/// THE SOFTWARE. +/// +/// @ref core +/// @file glm/detail/type_tvec4_avx2.inl +/// @date 2014-12-01 / 2014-12-01 +/// @author Christophe Riccio +/////////////////////////////////////////////////////////////////////////////////// + +namespace glm{ +namespace detail +{ + +}//namespace detail + + + +}//namespace glm diff --git a/glm/detail/type_vec4_sse2.inl b/glm/detail/type_vec4_sse2.inl new file mode 100644 index 00000000..eb7b3d6b --- /dev/null +++ b/glm/detail/type_vec4_sse2.inl @@ -0,0 +1,41 @@ +/////////////////////////////////////////////////////////////////////////////////// +/// OpenGL Mathematics (glm.g-truc.net) +/// +/// Copyright (c) 2005 - 2014 G-Truc Creation (www.g-truc.net) +/// Permission is hereby granted, free of charge, to any person obtaining a copy +/// of this software and associated documentation files (the "Software"), to deal +/// in the Software without restriction, including without limitation the rights +/// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +/// copies of the Software, and to permit persons to whom the Software is +/// furnished to do so, subject to the following conditions: +/// +/// The above copyright notice and this permission notice shall be included in +/// all copies or substantial portions of the Software. +/// +/// Restrictions: +/// By making use of the Software for military purposes, you choose to make +/// a Bunny unhappy. +/// +/// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +/// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +/// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +/// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +/// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +/// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +/// THE SOFTWARE. +/// +/// @ref core +/// @file glm/detail/type_tvec4_sse2.inl +/// @date 2014-12-01 / 2014-12-01 +/// @author Christophe Riccio +/////////////////////////////////////////////////////////////////////////////////// + +namespace glm{ +namespace detail +{ + +}//namespace detail + + + +}//namespace glm From 459fe3a3fe7688fc5a8df307fc62450f5253516a Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 8 Dec 2014 23:21:59 +0100 Subject: [PATCH 10/11] Fixed Android build issue, STL C++11 is not supported by the NDK #284 --- glm/detail/setup.hpp | 6 ++++++ readme.txt | 1 + 2 files changed, 7 insertions(+) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 42b6beee..c26334f5 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -453,11 +453,17 @@ // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx // N1720 +/* #if GLM_COMPILER & GLM_COMPILER_CLANG # define GLM_HAS_CXX11_STL (GLM_LANG & GLM_LANG_CXX11_FLAG) && __has_include(<__config>) #else # define GLM_HAS_CXX11_STL (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015) #endif +*/ +#define GLM_HAS_CXX11_STL ((GLM_PLATFORM != GLM_PLATFORM_ANDROID) && (\ + (GLM_LANG & GLM_LANG_CXX11_FLAG) || \ + ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \ + ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015)))) // N1720 #define GLM_HAS_STATIC_ASSERT ( \ diff --git a/readme.txt b/readme.txt index 5027ddff..2bef34ca 100644 --- a/readme.txt +++ b/readme.txt @@ -69,6 +69,7 @@ Fixes: - Fixed scalar uaddCarry build error with Cuda #276 - Fixed C++11 explicit conversion operators detection #282 - Fixed missing explicit convertion when using integer log2 with *vec1 types +- Fixed Android build issue, STL C++11 is not supported by the NDK #284 ================================================================================ GLM 0.9.6.0: 2014-11-30 From ff006034dfaabc11860084fe0c4478061cda8db9 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 8 Dec 2014 23:49:14 +0100 Subject: [PATCH 11/11] Fixed unsupported _BitScanForward64 and _BitScanReverse64 in VC10, Fixed Visual C++ 32 bit build #283 --- glm/detail/func_integer.inl | 20 +++++--- glm/detail/type_vec4.hpp | 8 +-- glm/detail/type_vec4.inl | 94 +---------------------------------- glm/detail/type_vec4_sse2.inl | 79 +++++++++++++++++++++++++++++ readme.txt | 2 + 5 files changed, 100 insertions(+), 103 deletions(-) diff --git a/glm/detail/func_integer.inl b/glm/detail/func_integer.inl index cc1c4d33..eead6f9a 100644 --- a/glm/detail/func_integer.inl +++ b/glm/detail/func_integer.inl @@ -116,6 +116,7 @@ namespace detail } }; +# if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER < GLM_COMPILER_VC2013) && (GLM_MODEL == GLM_MODEL_32)) template struct compute_findLSB { @@ -126,6 +127,7 @@ namespace detail return IsNotNull ? int(Result) : -1; } }; +# endif # endif//GLM_HAS_BITSCAN_WINDOWS template class vecType, bool EXEC = true> @@ -171,14 +173,6 @@ namespace detail return IsNotNull ? int(Result) : -1; } - template - GLM_FUNC_QUALIFIER int compute_findMSB_64(genIUType Value) - { - unsigned long Result(0); - unsigned char IsNotNull = _BitScanReverse64(&Result, *reinterpret_cast(&Value)); - return IsNotNull ? int(Result) : -1; - } - template class vecType> struct compute_findMSB_vec { @@ -188,6 +182,15 @@ namespace detail } }; +# if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER < GLM_COMPILER_VC2013) && (GLM_MODEL == GLM_MODEL_32)) + template + GLM_FUNC_QUALIFIER int compute_findMSB_64(genIUType Value) + { + unsigned long Result(0); + unsigned char IsNotNull = _BitScanReverse64(&Result, *reinterpret_cast(&Value)); + return IsNotNull ? int(Result) : -1; + } + template class vecType> struct compute_findMSB_vec { @@ -196,6 +199,7 @@ namespace detail return detail::functor1::call(compute_findMSB_64, x); } }; +# endif # endif//GLM_HAS_BITSCAN_WINDOWS }//namespace detail diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index b62906a2..95d3f5fe 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -53,7 +53,9 @@ namespace detail typedef T type[4]; }; -# if GLM_ARCH & GLM_ARCH_SSE2 +# define GLM_NOT_BUGGY_VC32BITS !(GLM_MODEL == GLM_MODEL_32 && GLM_COMPILER & GLM_COMPILER_VC && GLM_COMPILER < GLM_COMPILER_VC2013) + +# if GLM_ARCH & GLM_ARCH_SSE2 && GLM_NOT_BUGGY_VC32BITS template <> struct simd { @@ -73,7 +75,7 @@ namespace detail }; # endif -# if GLM_ARCH & GLM_ARCH_AVX +# if GLM_ARCH & GLM_ARCH_AVX && GLM_NOT_BUGGY_VC32BITS template <> struct simd { @@ -81,7 +83,7 @@ namespace detail }; # endif -# if GLM_ARCH & GLM_ARCH_AVX2 +# if GLM_ARCH & GLM_ARCH_AVX2 && GLM_NOT_BUGGY_VC32BITS template <> struct simd { diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index 6509efb8..38fb6b5f 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -42,22 +42,6 @@ namespace glm # endif {} -#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2) - template <> - GLM_FUNC_QUALIFIER tvec4::tvec4() -# ifndef GLM_FORCE_NO_CTOR_INIT - : data(_mm_setzero_ps()) -# endif - {} - - template <> - GLM_FUNC_QUALIFIER tvec4::tvec4() -# ifndef GLM_FORCE_NO_CTOR_INIT - : data(_mm_setzero_ps()) -# endif - {} -#endif - template template GLM_FUNC_QUALIFIER tvec4::tvec4(tvec4 const & v) @@ -76,35 +60,11 @@ namespace glm : x(s), y(s), z(s), w(s) {} -#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2) - template <> - GLM_FUNC_QUALIFIER tvec4::tvec4(float s) : - data(_mm_set1_ps(s)) - {} - - template <> - GLM_FUNC_QUALIFIER tvec4::tvec4(float s) : - data(_mm_set1_ps(s)) - {} -#endif - template GLM_FUNC_QUALIFIER tvec4::tvec4(T a, T b, T c, T d) : x(a), y(b), z(c), w(d) {} -#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2) - template <> - GLM_FUNC_QUALIFIER tvec4::tvec4(float a, float b, float c, float d) : - data(_mm_set_ps(d, c, b, a)) - {} - - template <> - GLM_FUNC_QUALIFIER tvec4::tvec4(float a, float b, float c, float d) : - data(_mm_set_ps(d, c, b, a)) - {} -#endif - ////////////////////////////////////// // Conversion scalar constructors @@ -307,40 +267,6 @@ namespace glm return *this; } -#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2) - template <> - template - GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(U scalar) - { - this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast(scalar))); - return *this; - } - - template <> - template <> - GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(float scalar) - { - this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar)); - return *this; - } - - template <> - template - GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(U scalar) - { - this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast(scalar))); - return *this; - } - - template <> - template <> - GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(float scalar) - { - this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar)); - return *this; - } -#endif - template template GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(tvec1 const & v) @@ -353,24 +279,6 @@ namespace glm return *this; } -#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2) - template <> - template - GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(tvec1 const & v) - { - this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast(v.x))); - return *this; - } - - template <> - template - GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(tvec1 const & v) - { - this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast(v.x))); - return *this; - } -#endif - template template GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(tvec4 const & v) @@ -1188,6 +1096,7 @@ namespace glm } }//namespace glm +#if GLM_HAS_ANONYMOUS_UNION && GLM_NOT_BUGGY_VC32BITS #if GLM_ARCH & GLM_ARCH_SSE2 # include "type_vec4_sse2.inl" #endif @@ -1197,3 +1106,4 @@ namespace glm #if GLM_ARCH & GLM_ARCH_AVX2 # include "type_vec4_avx2.inl" #endif +#endif// diff --git a/glm/detail/type_vec4_sse2.inl b/glm/detail/type_vec4_sse2.inl index eb7b3d6b..cacec35a 100644 --- a/glm/detail/type_vec4_sse2.inl +++ b/glm/detail/type_vec4_sse2.inl @@ -36,6 +36,85 @@ namespace detail }//namespace detail + template <> + GLM_FUNC_QUALIFIER tvec4::tvec4() +# ifndef GLM_FORCE_NO_CTOR_INIT + : data(_mm_setzero_ps()) +# endif + {} + template <> + GLM_FUNC_QUALIFIER tvec4::tvec4() +# ifndef GLM_FORCE_NO_CTOR_INIT + : data(_mm_setzero_ps()) +# endif + {} + template <> + GLM_FUNC_QUALIFIER tvec4::tvec4(float s) : + data(_mm_set1_ps(s)) + {} + + template <> + GLM_FUNC_QUALIFIER tvec4::tvec4(float s) : + data(_mm_set1_ps(s)) + {} + + template <> + GLM_FUNC_QUALIFIER tvec4::tvec4(float a, float b, float c, float d) : + data(_mm_set_ps(d, c, b, a)) + {} + + template <> + GLM_FUNC_QUALIFIER tvec4::tvec4(float a, float b, float c, float d) : + data(_mm_set_ps(d, c, b, a)) + {} + + template <> + template + GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(U scalar) + { + this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast(scalar))); + return *this; + } + + template <> + template <> + GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(float scalar) + { + this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar)); + return *this; + } + + template <> + template + GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(U scalar) + { + this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast(scalar))); + return *this; + } + + template <> + template <> + GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(float scalar) + { + this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar)); + return *this; + } + + template <> + template + GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(tvec1 const & v) + { + this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast(v.x))); + return *this; + } + + template <> + template + GLM_FUNC_QUALIFIER tvec4 & tvec4::operator+=(tvec1 const & v) + { + this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast(v.x))); + return *this; + } }//namespace glm diff --git a/readme.txt b/readme.txt index 2bef34ca..7bd57fb4 100644 --- a/readme.txt +++ b/readme.txt @@ -70,6 +70,8 @@ Fixes: - Fixed C++11 explicit conversion operators detection #282 - Fixed missing explicit convertion when using integer log2 with *vec1 types - Fixed Android build issue, STL C++11 is not supported by the NDK #284 +- Fixed unsupported _BitScanForward64 and _BitScanReverse64 in VC10 +- Fixed Visual C++ 32 bit build #283 ================================================================================ GLM 0.9.6.0: 2014-11-30