Skip to content

Commit 18feaec

Browse files
authored
Merge pull request #1311 from alusch/neon-compile-error
Fix build error with GLM_FORCE_INTRINSICS and NEON #1311
2 parents 5221557 + b30313a commit 18feaec

File tree

4 files changed

+448
-4
lines changed

4 files changed

+448
-4
lines changed

glm/detail/func_common_simd.inl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ namespace glm {
572572
template<length_t L, qualifier Q>
573573
struct compute_splat<L, float, Q, true> {
574574
template<int c>
575-
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call(vec<L, float, Q> const& a)
575+
GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call(vec<L, float, Q> const&)
576576
{}
577577

578578
template<>

glm/detail/type_vec_simd.inl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ struct _swizzle_base1<L, uint, Q, E0, E1, E2, E3, true> : public _swizzle_base1<
921921
{
922922
static bool call(vec<L, float, Q> const& v1, vec<L, float, Q> const& v2)
923923
{
924-
return !compute_vec_equal<float, Q, false, 32, true>::call(v1, v2);
924+
return !compute_vec_equal<L, float, Q, false, 32, true>::call(v1, v2);
925925
}
926926
};
927927

@@ -930,7 +930,7 @@ struct _swizzle_base1<L, uint, Q, E0, E1, E2, E3, true> : public _swizzle_base1<
930930
{
931931
static bool call(vec<L, uint, Q> const& v1, vec<L, uint, Q> const& v2)
932932
{
933-
return !compute_vec_equal<uint, Q, false, 32, true>::call(v1, v2);
933+
return !compute_vec_equal<L, uint, Q, false, 32, true>::call(v1, v2);
934934
}
935935
};
936936

@@ -939,7 +939,7 @@ struct _swizzle_base1<L, uint, Q, E0, E1, E2, E3, true> : public _swizzle_base1<
939939
{
940940
static bool call(vec<L, int, Q> const& v1, vec<L, int, Q> const& v2)
941941
{
942-
return !compute_vec_equal<int, Q, false, 32, true>::call(v1, v2);
942+
return !compute_vec_equal<L, int, Q, false, 32, true>::call(v1, v2);
943943
}
944944
};
945945

test/core/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ glmCreateTestGTC(core_force_arch_unknown)
66
glmCreateTestGTC(core_force_compiler_unknown)
77
glmCreateTestGTC(core_force_explicit_ctor)
88
glmCreateTestGTC(core_force_inline)
9+
glmCreateTestGTC(core_force_intrinsics)
910
glmCreateTestGTC(core_force_platform_unknown)
1011
glmCreateTestGTC(core_force_pure)
1112
glmCreateTestGTC(core_force_unrestricted_gentype)

0 commit comments

Comments
 (0)