mirror of
https://github.com/g-truc/glm.git
synced 2024-11-10 04:31:47 +00:00
Fixed GTX_compatibility on Android r7
This commit is contained in:
parent
ac768ea12b
commit
958bb6f6ca
@ -52,6 +52,9 @@
|
|||||||
#include <cfloat>
|
#include <cfloat>
|
||||||
#elif(GLM_COMPILER & GLM_COMPILER_GCC)
|
#elif(GLM_COMPILER & GLM_COMPILER_GCC)
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
|
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
|
||||||
|
# undef isfinite
|
||||||
|
# endif
|
||||||
#endif//GLM_COMPILER
|
#endif//GLM_COMPILER
|
||||||
|
|
||||||
namespace glm
|
namespace glm
|
||||||
|
@ -14,11 +14,18 @@ namespace glm
|
|||||||
GLM_FUNC_QUALIFIER bool isfinite(
|
GLM_FUNC_QUALIFIER bool isfinite(
|
||||||
genType const & x)
|
genType const & x)
|
||||||
{
|
{
|
||||||
#if(GLM_COMPILER & GLM_COMPILER_VC)
|
# if(GLM_COMPILER & GLM_COMPILER_VC)
|
||||||
return _finite(x);
|
return _finite(x);
|
||||||
#else//(GLM_COMPILER & GLM_COMPILER_GCC)
|
# elif(GLM_COMPILER & GLM_COMPILER_GCC)
|
||||||
return std::isfinite(x) != 0;
|
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
|
||||||
#endif
|
return _isfinite(x) != 0;
|
||||||
|
# else
|
||||||
|
return std::isfinite(x) != 0;
|
||||||
|
# endif
|
||||||
|
# else
|
||||||
|
return std::isfinite(x) != 0;
|
||||||
|
# endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename valType>
|
template <typename valType>
|
||||||
@ -56,11 +63,17 @@ namespace glm
|
|||||||
GLM_FUNC_QUALIFIER bool isinf(
|
GLM_FUNC_QUALIFIER bool isinf(
|
||||||
genType const & x)
|
genType const & x)
|
||||||
{
|
{
|
||||||
#if(GLM_COMPILER & GLM_COMPILER_VC)
|
# if(GLM_COMPILER & GLM_COMPILER_VC)
|
||||||
return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
|
return _fpclass(x) == _FPCLASS_NINF || _fpclass(x) == _FPCLASS_PINF;
|
||||||
#else
|
# elif(GLM_COMPILER & GLM_COMPILER_GCC)
|
||||||
return std::isinf(x) != 0;
|
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
|
||||||
#endif
|
return _isinf(x) != 0;
|
||||||
|
# else
|
||||||
|
return std::isinf(x) != 0;
|
||||||
|
# endif
|
||||||
|
# else
|
||||||
|
return std::isinf(x) != 0;
|
||||||
|
# endif
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename valType>
|
template <typename valType>
|
||||||
@ -97,11 +110,17 @@ namespace glm
|
|||||||
template <typename genType>
|
template <typename genType>
|
||||||
GLM_FUNC_QUALIFIER bool isnan(genType const & x)
|
GLM_FUNC_QUALIFIER bool isnan(genType const & x)
|
||||||
{
|
{
|
||||||
#if(GLM_COMPILER & GLM_COMPILER_VC)
|
# if(GLM_COMPILER & GLM_COMPILER_VC)
|
||||||
return _isnan(x);
|
return _isnan(x);
|
||||||
#else
|
# elif(GLM_COMPILER & GLM_COMPILER_GCC)
|
||||||
return std::isnan(x) != 0;
|
# if(GLM_PLATFORM & GLM_PLATFORM_ANDROID)
|
||||||
#endif
|
return _isnan(x) != 0;
|
||||||
|
# else
|
||||||
|
return std::isnan(x) != 0;
|
||||||
|
# endif
|
||||||
|
# else
|
||||||
|
return std::isnan(x) != 0;
|
||||||
|
# endif
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename valType>
|
template <typename valType>
|
||||||
|
Loading…
Reference in New Issue
Block a user