diff --git a/glm/detail/type_vec4.hpp b/glm/detail/type_vec4.hpp index 4cd69dcd..5a03cd47 100644 --- a/glm/detail/type_vec4.hpp +++ b/glm/detail/type_vec4.hpp @@ -101,7 +101,7 @@ namespace glm /// Explicit converions (From section 5.4.1 Conversion and scalar constructors of GLSL 1.30.08 specification) template - GLM_FUNC_DECL GLM_CONSTEXPR tvec4(A a, B b, C c, D d); + GLM_FUNC_DECL GLM_CONSTEXPR_SIMD tvec4(A a, B b, C c, D d); template GLM_FUNC_DECL GLM_CONSTEXPR tvec4(tvec1 const& a, tvec1 const& b, tvec1 const& c, tvec1 const& d); diff --git a/glm/detail/type_vec4.inl b/glm/detail/type_vec4.inl index d7bbf386..496da9d6 100644 --- a/glm/detail/type_vec4.inl +++ b/glm/detail/type_vec4.inl @@ -196,7 +196,7 @@ namespace detail template template - GLM_FUNC_QUALIFIER GLM_CONSTEXPR tvec4::tvec4(A a, B b, C c, D d) : + GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec4(A a, B b, C c, D d) : x(static_cast(a)), y(static_cast(b)), z(static_cast(c)), diff --git a/glm/detail/type_vec4_simd.inl b/glm/detail/type_vec4_simd.inl index 6ae818f5..55db422e 100644 --- a/glm/detail/type_vec4_simd.inl +++ b/glm/detail/type_vec4_simd.inl @@ -458,7 +458,7 @@ namespace detail GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec4(int32 a, int32 b, int32 c, int32 d) : data(_mm_set_epi32(d, c, b, a)) {} -/* + template <> template <> GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec4(int32 a, int32 b, int32 c, int32 d) : @@ -476,7 +476,6 @@ namespace detail GLM_FUNC_QUALIFIER GLM_CONSTEXPR_SIMD tvec4::tvec4(int32 a, int32 b, int32 c, int32 d) : data(_mm_castsi128_ps(_mm_set_epi32(d, c, b, a))) {} -*/ }//namespace glm #endif//GLM_ARCH & GLM_ARCH_SSE2_BIT diff --git a/readme.md b/readme.md index e1222046..1952d2d3 100644 --- a/readme.md +++ b/readme.md @@ -71,7 +71,8 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) #### [GLM 0.9.8.1](https://github.com/g-truc/glm/tree/0.9.8) - 2016-XX-XX ##### Fixes: - Fixed GCC warning filtering, replaced -pedantic by -Wpedantic -- Fixed SIMD faceforward bug. #549 +- Fixed SIMD faceforward bug. #549 +- Fixed GCC 4.8 with C++11 compilation option #550 #### [GLM 0.9.8.0](https://github.com/g-truc/glm/releases/tag/0.9.8.0) - 2016-09-11 ##### Features: