mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-25 18:04:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'g-truc:master' into master

Browse Source
This commit is contained in:
Sean Harmer 2024-05-16 09:06:07 +01:00 committed by GitHub
commit 1945c2768a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/compute_vector_decl.hpp
View File

@ -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) GLM_FUNC_QUALIFIER GLM_CONSTEXPR static bool call(vec<L, T, Q> const& v1, vec<L, T, Q> const& v2)
{ {
bool b = true; bool b = true;
for (length_t i = 0; i < L; ++i) for (length_t i = 0; b && i < L; ++i)
b = b && detail::compute_equal<T, std::numeric_limits<T>::is_iec559>::call(v1.x, v2.x); b = detail::compute_equal<T, std::numeric_limits<T>::is_iec559>::call(v1[i], v2[i]);
return b; return b;
} }
}; };

2
glm/detail/func_exponential.inl
View File

@ -14,7 +14,7 @@ namespace detail
using std::log2; using std::log2;
# else # else
template<typename genType> template<typename genType>
genType log2(genType Value) GLM_FUNC_QUALIFIER genType log2(genType Value)
{ {
return std::log(Value) * static_cast<genType>(1.4426950408889634073599246810019); return std::log(Value) * static_cast<genType>(1.4426950408889634073599246810019);
} }

6
glm/detail/setup.hpp
View File

@ -594,7 +594,11 @@
# define GLM_DEPRECATED __declspec(deprecated) # define GLM_DEPRECATED __declspec(deprecated)
# define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef __declspec(align(alignment)) type name # 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) #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))) # define GLM_ALIGNED_TYPEDEF(type, name, alignment) typedef type name __attribute__((aligned(alignment)))
#elif (GLM_COMPILER & GLM_COMPILER_CUDA) || (GLM_COMPILER & GLM_COMPILER_HIP) #elif (GLM_COMPILER & GLM_COMPILER_CUDA) || (GLM_COMPILER & GLM_COMPILER_HIP)
# define GLM_DEPRECATED # define GLM_DEPRECATED