mirror of
https://github.com/g-truc/glm.git
synced 2025-04-07 06:25:00 +00:00
Merge a6431989fb
into 2d4c4b4dd3
This commit is contained in:
commit
a5a6c2f27e
3 changed files with 3 additions and 3 deletions
|
@ -345,7 +345,7 @@ namespace detail
|
|||
template<int c>
|
||||
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, T, Q> call(vec<L, T, Q> const& a)
|
||||
{
|
||||
vec<L, T, Q> v(0.0f);
|
||||
vec<L, T, Q> v(0);
|
||||
for (int i = 0; i < L; ++i)
|
||||
v[i] = a[c];
|
||||
return v;
|
||||
|
|
|
@ -553,7 +553,7 @@ namespace glm {
|
|||
GLM_FUNC_QUALIFIER static vec<4, float, Q> call(vec<3, float, Q> const& a)
|
||||
{
|
||||
vec<4, float, Q> v;
|
||||
static const uint32x4_t mask = { 0, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF };
|
||||
static const uint32x4_t mask = { 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0 };
|
||||
v.data = vbslq_f32(mask, a.data, vdupq_n_f32(0));
|
||||
return v;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include <glm/glm.hpp>
|
||||
|
||||
#if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE && !(GLM_ARCH & GLM_ARCH_NEON_BIT) // Fail on Github macOS latest C.I.
|
||||
#if GLM_CONFIG_ALIGNED_GENTYPES == GLM_ENABLE
|
||||
#include <glm/gtc/type_aligned.hpp>
|
||||
#include <glm/gtc/type_precision.hpp>
|
||||
#include <glm/ext/scalar_relational.hpp>
|
||||
|
|
Loading…
Add table
Reference in a new issue