mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Fixed merge
This commit is contained in:
commit
c02d031eaf
@ -116,6 +116,7 @@ namespace detail
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER < GLM_COMPILER_VC2013) && (GLM_MODEL == GLM_MODEL_32))
|
||||||
template <typename genIUType>
|
template <typename genIUType>
|
||||||
struct compute_findLSB<genIUType, 64>
|
struct compute_findLSB<genIUType, 64>
|
||||||
{
|
{
|
||||||
@ -126,6 +127,7 @@ namespace detail
|
|||||||
return IsNotNull ? int(Result) : -1;
|
return IsNotNull ? int(Result) : -1;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
# endif
|
||||||
# endif//GLM_HAS_BITSCAN_WINDOWS
|
# endif//GLM_HAS_BITSCAN_WINDOWS
|
||||||
|
|
||||||
template <typename T, glm::precision P, template <class, glm::precision> class vecType, bool EXEC = true>
|
template <typename T, glm::precision P, template <class, glm::precision> class vecType, bool EXEC = true>
|
||||||
@ -171,14 +173,6 @@ namespace detail
|
|||||||
return IsNotNull ? int(Result) : -1;
|
return IsNotNull ? int(Result) : -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename genIUType>
|
|
||||||
GLM_FUNC_QUALIFIER int compute_findMSB_64(genIUType Value)
|
|
||||||
{
|
|
||||||
unsigned long Result(0);
|
|
||||||
unsigned char IsNotNull = _BitScanReverse64(&Result, *reinterpret_cast<unsigned __int64*>(&Value));
|
|
||||||
return IsNotNull ? int(Result) : -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T, glm::precision P, template <class, glm::precision> class vecType>
|
template <typename T, glm::precision P, template <class, glm::precision> class vecType>
|
||||||
struct compute_findMSB_vec<T, P, vecType, 32>
|
struct compute_findMSB_vec<T, P, vecType, 32>
|
||||||
{
|
{
|
||||||
@ -188,6 +182,15 @@ namespace detail
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
# if !((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER < GLM_COMPILER_VC2013) && (GLM_MODEL == GLM_MODEL_32))
|
||||||
|
template <typename genIUType>
|
||||||
|
GLM_FUNC_QUALIFIER int compute_findMSB_64(genIUType Value)
|
||||||
|
{
|
||||||
|
unsigned long Result(0);
|
||||||
|
unsigned char IsNotNull = _BitScanReverse64(&Result, *reinterpret_cast<unsigned __int64*>(&Value));
|
||||||
|
return IsNotNull ? int(Result) : -1;
|
||||||
|
}
|
||||||
|
|
||||||
template <typename T, glm::precision P, template <class, glm::precision> class vecType>
|
template <typename T, glm::precision P, template <class, glm::precision> class vecType>
|
||||||
struct compute_findMSB_vec<T, P, vecType, 64>
|
struct compute_findMSB_vec<T, P, vecType, 64>
|
||||||
{
|
{
|
||||||
@ -196,6 +199,7 @@ namespace detail
|
|||||||
return detail::functor1<int, T, P, vecType>::call(compute_findMSB_64, x);
|
return detail::functor1<int, T, P, vecType>::call(compute_findMSB_64, x);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
# endif
|
||||||
# endif//GLM_HAS_BITSCAN_WINDOWS
|
# endif//GLM_HAS_BITSCAN_WINDOWS
|
||||||
}//namespace detail
|
}//namespace detail
|
||||||
|
|
||||||
|
@ -453,9 +453,17 @@
|
|||||||
// http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
|
// http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
|
||||||
|
|
||||||
// N1720
|
// N1720
|
||||||
#define GLM_HAS_CXX11_STL ( \
|
/*
|
||||||
|
#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_CXX11_FLAG) || \
|
||||||
((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015)))
|
((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
|
// N1720
|
||||||
#define GLM_HAS_STATIC_ASSERT ( \
|
#define GLM_HAS_STATIC_ASSERT ( \
|
||||||
|
@ -53,7 +53,9 @@ namespace detail
|
|||||||
typedef T type[4];
|
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 <>
|
template <>
|
||||||
struct simd<float>
|
struct simd<float>
|
||||||
{
|
{
|
||||||
@ -73,7 +75,7 @@ namespace detail
|
|||||||
};
|
};
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# if GLM_ARCH & GLM_ARCH_AVX
|
# if GLM_ARCH & GLM_ARCH_AVX && GLM_NOT_BUGGY_VC32BITS
|
||||||
template <>
|
template <>
|
||||||
struct simd<double>
|
struct simd<double>
|
||||||
{
|
{
|
||||||
@ -81,7 +83,7 @@ namespace detail
|
|||||||
};
|
};
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
# if GLM_ARCH & GLM_ARCH_AVX2
|
# if GLM_ARCH & GLM_ARCH_AVX2 && GLM_NOT_BUGGY_VC32BITS
|
||||||
template <>
|
template <>
|
||||||
struct simd<int64>
|
struct simd<int64>
|
||||||
{
|
{
|
||||||
|
@ -42,22 +42,6 @@ namespace glm
|
|||||||
# endif
|
# endif
|
||||||
{}
|
{}
|
||||||
|
|
||||||
#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2)
|
|
||||||
template <>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4()
|
|
||||||
# ifndef GLM_FORCE_NO_CTOR_INIT
|
|
||||||
: data(_mm_setzero_ps())
|
|
||||||
# endif
|
|
||||||
{}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4()
|
|
||||||
# ifndef GLM_FORCE_NO_CTOR_INIT
|
|
||||||
: data(_mm_setzero_ps())
|
|
||||||
# endif
|
|
||||||
{}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <typename T, precision P>
|
template <typename T, precision P>
|
||||||
template <precision Q>
|
template <precision Q>
|
||||||
GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec4<T, Q> const & v)
|
GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(tvec4<T, Q> const & v)
|
||||||
@ -76,35 +60,11 @@ namespace glm
|
|||||||
: x(s), y(s), z(s), w(s)
|
: x(s), y(s), z(s), w(s)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2)
|
|
||||||
template <>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4(float s) :
|
|
||||||
data(_mm_set1_ps(s))
|
|
||||||
{}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4(float s) :
|
|
||||||
data(_mm_set1_ps(s))
|
|
||||||
{}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <typename T, precision P>
|
template <typename T, precision P>
|
||||||
GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(T a, T b, T c, T d)
|
GLM_FUNC_QUALIFIER tvec4<T, P>::tvec4(T a, T b, T c, T d)
|
||||||
: x(a), y(b), z(c), w(d)
|
: x(a), y(b), z(c), w(d)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2)
|
|
||||||
template <>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4(float a, float b, float c, float d) :
|
|
||||||
data(_mm_set_ps(d, c, b, a))
|
|
||||||
{}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4(float a, float b, float c, float d) :
|
|
||||||
data(_mm_set_ps(d, c, b, a))
|
|
||||||
{}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//////////////////////////////////////
|
//////////////////////////////////////
|
||||||
// Conversion scalar constructors
|
// Conversion scalar constructors
|
||||||
|
|
||||||
@ -307,40 +267,6 @@ namespace glm
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2)
|
|
||||||
template <>
|
|
||||||
template <typename U>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=(U scalar)
|
|
||||||
{
|
|
||||||
this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(scalar)));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
template <>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=<float>(float scalar)
|
|
||||||
{
|
|
||||||
this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
template <typename U>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=(U scalar)
|
|
||||||
{
|
|
||||||
this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(scalar)));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
template <>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=<float>(float scalar)
|
|
||||||
{
|
|
||||||
this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <typename T, precision P>
|
template <typename T, precision P>
|
||||||
template <typename U>
|
template <typename U>
|
||||||
GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator+=(tvec1<U, P> const & v)
|
GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator+=(tvec1<U, P> const & v)
|
||||||
@ -353,24 +279,6 @@ namespace glm
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if GLM_HAS_ANONYMOUS_UNION && (GLM_ARCH & GLM_ARCH_SSE2)
|
|
||||||
template <>
|
|
||||||
template <typename U>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=(tvec1<U, lowp> const & v)
|
|
||||||
{
|
|
||||||
this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(v.x)));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
template <>
|
|
||||||
template <typename U>
|
|
||||||
GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=(tvec1<U, mediump> const & v)
|
|
||||||
{
|
|
||||||
this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(v.x)));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
template <typename T, precision P>
|
template <typename T, precision P>
|
||||||
template <typename U>
|
template <typename U>
|
||||||
GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator+=(tvec4<U, P> const & v)
|
GLM_FUNC_QUALIFIER tvec4<T, P> & tvec4<T, P>::operator+=(tvec4<U, P> const & v)
|
||||||
@ -1187,3 +1095,15 @@ namespace glm
|
|||||||
~v.w);
|
~v.w);
|
||||||
}
|
}
|
||||||
}//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
|
||||||
|
#if GLM_ARCH & GLM_ARCH_AVX
|
||||||
|
# include "type_vec4_avx.inl"
|
||||||
|
#endif
|
||||||
|
#if GLM_ARCH & GLM_ARCH_AVX2
|
||||||
|
# include "type_vec4_avx2.inl"
|
||||||
|
#endif
|
||||||
|
#endif//
|
||||||
|
41
glm/detail/type_vec4_avx.inl
Normal file
41
glm/detail/type_vec4_avx.inl
Normal file
@ -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
|
41
glm/detail/type_vec4_avx2.inl
Normal file
41
glm/detail/type_vec4_avx2.inl
Normal file
@ -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
|
120
glm/detail/type_vec4_sse2.inl
Normal file
120
glm/detail/type_vec4_sse2.inl
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
///////////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// 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
|
||||||
|
|
||||||
|
template <>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4()
|
||||||
|
# ifndef GLM_FORCE_NO_CTOR_INIT
|
||||||
|
: data(_mm_setzero_ps())
|
||||||
|
# endif
|
||||||
|
{}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4()
|
||||||
|
# ifndef GLM_FORCE_NO_CTOR_INIT
|
||||||
|
: data(_mm_setzero_ps())
|
||||||
|
# endif
|
||||||
|
{}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4(float s) :
|
||||||
|
data(_mm_set1_ps(s))
|
||||||
|
{}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4(float s) :
|
||||||
|
data(_mm_set1_ps(s))
|
||||||
|
{}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, lowp>::tvec4(float a, float b, float c, float d) :
|
||||||
|
data(_mm_set_ps(d, c, b, a))
|
||||||
|
{}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, mediump>::tvec4(float a, float b, float c, float d) :
|
||||||
|
data(_mm_set_ps(d, c, b, a))
|
||||||
|
{}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
template <typename U>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=(U scalar)
|
||||||
|
{
|
||||||
|
this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(scalar)));
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
template <>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=<float>(float scalar)
|
||||||
|
{
|
||||||
|
this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar));
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
template <typename U>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=(U scalar)
|
||||||
|
{
|
||||||
|
this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(scalar)));
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
template <>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=<float>(float scalar)
|
||||||
|
{
|
||||||
|
this->data = _mm_add_ps(this->data, _mm_set_ps1(scalar));
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
template <typename U>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, lowp> & tvec4<float, lowp>::operator+=(tvec1<U, lowp> const & v)
|
||||||
|
{
|
||||||
|
this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(v.x)));
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <>
|
||||||
|
template <typename U>
|
||||||
|
GLM_FUNC_QUALIFIER tvec4<float, mediump> & tvec4<float, mediump>::operator+=(tvec1<U, mediump> const & v)
|
||||||
|
{
|
||||||
|
this->data = _mm_add_ps(this->data, _mm_set_ps1(static_cast<float>(v.x)));
|
||||||
|
return *this;
|
||||||
|
}
|
||||||
|
}//namespace glm
|
@ -70,6 +70,9 @@ Fixes:
|
|||||||
- Fixed C++11 explicit conversion operators detection #282
|
- Fixed C++11 explicit conversion operators detection #282
|
||||||
- Fixed missing explicit convertion when using integer log2 with *vec1 types
|
- Fixed missing explicit convertion when using integer log2 with *vec1 types
|
||||||
- Fixed 64 bits integer GTX_string_cast to_string on VC 32 bit compiler
|
- Fixed 64 bits integer GTX_string_cast to_string on VC 32 bit compiler
|
||||||
|
- 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
|
GLM 0.9.6.0: 2014-11-30
|
||||||
|
Loading…
Reference in New Issue
Block a user