Merge pull request #1311 from alusch/neon-compile-error

Fix build error with GLM_FORCE_INTRINSICS and NEON #1311
g-truc · Jan 5, 2025 · 18feaec · 18feaec
2 parents 5221557 + b30313a
commit 18feaec
Show file tree

Hide file tree

Showing 4 changed files with 448 additions and 4 deletions.
diff --git a/glm/detail/func_common_simd.inl b/glm/detail/func_common_simd.inl
@@ -572,7 +572,7 @@ namespace glm {
 		template<length_t L, qualifier Q>
 		struct compute_splat<L, float, Q, true> {
 			template<int c>
-			GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call(vec<L, float, Q> const& a)
+			GLM_FUNC_QUALIFIER GLM_CONSTEXPR static vec<L, float, Q> call(vec<L, float, Q> const&)
 			{}
 
 			template<>

diff --git a/glm/detail/type_vec_simd.inl b/glm/detail/type_vec_simd.inl
@@ -921,7 +921,7 @@ struct _swizzle_base1<L, uint, Q, E0, E1, E2, E3, true> : public _swizzle_base1<
 	{
 		static bool call(vec<L, float, Q> const& v1, vec<L, float, Q> const& v2)
 		{
-			return !compute_vec_equal<float, Q, false, 32, true>::call(v1, v2);
+			return !compute_vec_equal<L, float, Q, false, 32, true>::call(v1, v2);
 		}
 	};
 
@@ -930,7 +930,7 @@ struct _swizzle_base1<L, uint, Q, E0, E1, E2, E3, true> : public _swizzle_base1<
 	{
 		static bool call(vec<L, uint, Q> const& v1, vec<L, uint, Q> const& v2)
 		{
-			return !compute_vec_equal<uint, Q, false, 32, true>::call(v1, v2);
+			return !compute_vec_equal<L, uint, Q, false, 32, true>::call(v1, v2);
 		}
 	};
 
@@ -939,7 +939,7 @@ struct _swizzle_base1<L, uint, Q, E0, E1, E2, E3, true> : public _swizzle_base1<
 	{
 		static bool call(vec<L, int, Q> const& v1, vec<L, int, Q> const& v2)
 		{
-			return !compute_vec_equal<int, Q, false, 32, true>::call(v1, v2);
+			return !compute_vec_equal<L, int, Q, false, 32, true>::call(v1, v2);
 		}
 	};
 

diff --git a/test/core/CMakeLists.txt b/test/core/CMakeLists.txt
@@ -6,6 +6,7 @@ glmCreateTestGTC(core_force_arch_unknown)
 glmCreateTestGTC(core_force_compiler_unknown)
 glmCreateTestGTC(core_force_explicit_ctor)
 glmCreateTestGTC(core_force_inline)
+glmCreateTestGTC(core_force_intrinsics)
 glmCreateTestGTC(core_force_platform_unknown)
 glmCreateTestGTC(core_force_pure)
 glmCreateTestGTC(core_force_unrestricted_gentype)