LIBS: updated glm
parent
d274a8a13b
commit
739c72cc4e
|
@ -119,7 +119,7 @@
|
|||
# define GLM_LANG (GLM_LANG_CXX2A | GLM_LANG_EXT)
|
||||
# elif __cplusplus == 201703L || GLM_LANG_PLATFORM == 201703L
|
||||
# define GLM_LANG (GLM_LANG_CXX17 | GLM_LANG_EXT)
|
||||
# elif __cplusplus == 201402L || __cplusplus == 201500L || GLM_LANG_PLATFORM == 201402L
|
||||
# elif __cplusplus == 201402L || __cplusplus == 201406L || __cplusplus == 201500L || GLM_LANG_PLATFORM == 201402L
|
||||
# define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_EXT)
|
||||
# elif __cplusplus == 201103L || GLM_LANG_PLATFORM == 201103L
|
||||
# define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_EXT)
|
||||
|
|
|
@ -144,9 +144,10 @@ namespace glm
|
|||
template<typename T, qualifier Q>
|
||||
GLM_FUNC_QUALIFIER mat<4, 4, T, Q> lookAt(vec<3, T, Q> const& eye, vec<3, T, Q> const& center, vec<3, T, Q> const& up)
|
||||
{
|
||||
GLM_IF_CONSTEXPR(GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_LH_BIT)
|
||||
return lookAtLH(eye, center, up);
|
||||
else
|
||||
return lookAtRH(eye, center, up);
|
||||
# if (GLM_CONFIG_CLIP_CONTROL & GLM_CLIP_CONTROL_LH_BIT)
|
||||
return lookAtLH(eye, center, up);
|
||||
# else
|
||||
return lookAtRH(eye, center, up);
|
||||
# endif
|
||||
}
|
||||
}//namespace glm
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
namespace glm {
|
||||
namespace neon {
|
||||
static float32x4_t dupq_lane(float32x4_t vsrc, int lane) {
|
||||
static inline float32x4_t dupq_lane(float32x4_t vsrc, int lane) {
|
||||
switch(lane) {
|
||||
#if GLM_ARCH & GLM_ARCH_ARMV8_BIT
|
||||
case 0: return vdupq_laneq_f32(vsrc, 0);
|
||||
|
@ -26,7 +26,7 @@ namespace glm {
|
|||
return vdupq_n_f32(0.0f);
|
||||
}
|
||||
|
||||
static float32x2_t dup_lane(float32x4_t vsrc, int lane) {
|
||||
static inline float32x2_t dup_lane(float32x4_t vsrc, int lane) {
|
||||
switch(lane) {
|
||||
#if GLM_ARCH & GLM_ARCH_ARMV8_BIT
|
||||
case 0: return vdup_laneq_f32(vsrc, 0);
|
||||
|
@ -44,7 +44,7 @@ namespace glm {
|
|||
return vdup_n_f32(0.0f);
|
||||
}
|
||||
|
||||
static float32x4_t copy_lane(float32x4_t vdst, int dlane, float32x4_t vsrc, int slane) {
|
||||
static inline float32x4_t copy_lane(float32x4_t vdst, int dlane, float32x4_t vsrc, int slane) {
|
||||
#if GLM_ARCH & GLM_ARCH_ARMV8_BIT
|
||||
switch(dlane) {
|
||||
case 0:
|
||||
|
@ -102,7 +102,7 @@ namespace glm {
|
|||
return vdupq_n_f32(0.0f);
|
||||
}
|
||||
|
||||
static float32x4_t mul_lane(float32x4_t v, float32x4_t vlane, int lane) {
|
||||
static inline float32x4_t mul_lane(float32x4_t v, float32x4_t vlane, int lane) {
|
||||
#if GLM_ARCH & GLM_ARCH_ARMV8_BIT
|
||||
switch(lane) {
|
||||
case 0: return vmulq_laneq_f32(v, vlane, 0); break;
|
||||
|
@ -119,7 +119,7 @@ namespace glm {
|
|||
#endif
|
||||
}
|
||||
|
||||
static float32x4_t madd_lane(float32x4_t acc, float32x4_t v, float32x4_t vlane, int lane) {
|
||||
static inline float32x4_t madd_lane(float32x4_t acc, float32x4_t v, float32x4_t vlane, int lane) {
|
||||
#if GLM_ARCH & GLM_ARCH_ARMV8_BIT
|
||||
#ifdef GLM_CONFIG_FORCE_FMA
|
||||
# define FMADD_LANE(acc, x, y, L) do { asm volatile ("fmla %0.4s, %1.4s, %2.4s" : "+w"(acc) : "w"(x), "w"(dup_lane(y, L))); } while(0)
|
||||
|
|
|
@ -96,7 +96,7 @@ namespace glm
|
|||
template<length_t L, typename T, qualifier Q>
|
||||
GLM_FUNC_DECL vec<L, T, Q> asin(vec<L, T, Q> const& x);
|
||||
|
||||
/// Arc cosine. Returns an angle whose sine is x.
|
||||
/// Arc cosine. Returns an angle whose cosine is x.
|
||||
/// The range of values returned by this function is [0, PI].
|
||||
/// Results are undefined if |x| > 1.
|
||||
///
|
||||
|
|
Loading…
Reference in New Issue