mirror of
https://github.com/g-truc/glm.git
synced 2024-11-25 09:54:35 +00:00
Merge branch 'g-truc:master' into master
This commit is contained in:
commit
1945c2768a
@ -159,8 +159,8 @@ namespace glm {
|
||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(vec<L, T, Q> const& v1, vec<L, T, Q> const& v2)
|
||||
{
|
||||
bool b = true;
|
||||
for (length_t i = 0; i < L; ++i)
|
||||
b = b && detail::compute_equal<T, std::numeric_limits<T>::is_iec559>::call(v1.x, v2.x);
|
||||
for (length_t i = 0; b && i < L; ++i)
|
||||
b = detail::compute_equal<T, std::numeric_limits<T>::is_iec559>::call(v1[i], v2[i]);
|
||||
return b;
|
||||
}
|
||||
};
|
||||
|
@ -14,7 +14,7 @@ namespace detail
|
||||
using std::log2;
|
||||
# else
|
||||
template<typename genType>
|
||||
genType log2(genType Value)
|
||||
GLM_FUNC_QUALIFIER genType log2(genType Value)
|
||||
{
|
||||
return std::log(Value) * static_cast<genType>(1.4426950408889634073599246810019);
|
||||
}
|
||||
|
@ -594,7 +594,11 @@
|
||||
# define GLM_DEPRECATED __declspec(deprecated)
|
||||
# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef __declspec(align(alignment)) type name
|
||||
#elif GLM_COMPILER & (GLM_COMPILER_GCC | GLM_COMPILER_CLANG | GLM_COMPILER_INTEL)
|
||||
# define GLM_DEPRECATED __attribute__((__deprecated__))
|
||||
# if GLM_LANG & GLM_LANG_CXX14_FLAG
|
||||
# define GLM_DEPRECATED [[deprecated]]
|
||||
# else
|
||||
# define GLM_DEPRECATED __attribute__((__deprecated__))
|
||||
# endif
|
||||
# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef type name __attribute__((aligned(alignment)))
|
||||
#elif (GLM_COMPILER & GLM_COMPILER_CUDA) || (GLM_COMPILER & GLM_COMPILER_HIP)
|
||||
# define GLM_DEPRECATED
|
||||
|
Loading…
Reference in New Issue
Block a user