From 4043c26c24c11f1acc1d77013ad862f06621c823 Mon Sep 17 00:00:00 2001 From: Christophe Date: Thu, 18 Jan 2024 14:43:58 +0100 Subject: [PATCH] gna --- glm/detail/func_integer_simd.inl | 2 +- test/core/core_type_aligned.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/glm/detail/func_integer_simd.inl b/glm/detail/func_integer_simd.inl index 36f91192..5600c849 100644 --- a/glm/detail/func_integer_simd.inl +++ b/glm/detail/func_integer_simd.inl @@ -18,7 +18,7 @@ namespace detail __m128i const set2 = _mm_andnot_si128(set0, _mm_set1_epi32(-1)); __m128i const and2 = _mm_and_si128(set0, set2); - __m128i const sft2 = _mm_srai_epi32(and2, Shift); + __m128i const sft2 = _mm_srai_epi32(and2, static_cast(Shift)); __m128i const or0 = _mm_or_si128(sft1, sft2); diff --git a/test/core/core_type_aligned.cpp b/test/core/core_type_aligned.cpp index dff0939c..e7c0bef0 100644 --- a/test/core/core_type_aligned.cpp +++ b/test/core/core_type_aligned.cpp @@ -53,6 +53,11 @@ static int test_vec3_aligned() { int Error = 0; +#if GLM_COMPILER & GLM_COMPILER_CLANG +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wpadded" +#endif + struct Struct1 { glm::vec4 A; @@ -60,6 +65,10 @@ static int test_vec3_aligned() glm::vec3 C; }; +#if GLM_COMPILER & GLM_COMPILER_CLANG +# pragma clang diagnostic pop +#endif + std::size_t const Size1 = sizeof(Struct1); Error += Size1 == 48 ? 0 : 1;