From 712f27f768d0070bc84b58798f2e4420bf13d615 Mon Sep 17 00:00:00 2001 From: Christophe Date: Thu, 18 Jan 2024 17:39:41 +0100 Subject: [PATCH] gni --- test/core/core_type_aligned.cpp | 9 +++++++++ test/gtc/gtc_bitfield.cpp | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/core/core_type_aligned.cpp b/test/core/core_type_aligned.cpp index e7c0bef0..63421f84 100644 --- a/test/core/core_type_aligned.cpp +++ b/test/core/core_type_aligned.cpp @@ -72,6 +72,11 @@ static int test_vec3_aligned() std::size_t const Size1 = sizeof(Struct1); Error += Size1 == 48 ? 0 : 1; +#if GLM_COMPILER & GLM_COMPILER_CLANG +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wpadded" +#endif + struct Struct2 { glm::vec4 A; @@ -79,6 +84,10 @@ static int test_vec3_aligned() float C; }; +#if GLM_COMPILER & GLM_COMPILER_CLANG +# pragma clang diagnostic pop +#endif + std::size_t const Size2 = sizeof(Struct2); Error += Size2 == 48 ? 0 : 1; diff --git a/test/gtc/gtc_bitfield.cpp b/test/gtc/gtc_bitfield.cpp index 3e72d638..628cea39 100644 --- a/test/gtc/gtc_bitfield.cpp +++ b/test/gtc/gtc_bitfield.cpp @@ -359,7 +359,7 @@ namespace bitfieldInterleave #if GLM_ARCH & GLM_ARCH_SSE2_BIT static inline glm::uint64 sseBitfieldInterleave(glm::uint32 x, glm::uint32 y) { - __m128i const Array = _mm_set_epi32(0, y, 0, x); + __m128i const Array = _mm_set_epi32(0, static_cast(y), 0, static_cast(x)); __m128i const Mask4 = _mm_set1_epi32(0x0000FFFF); __m128i const Mask3 = _mm_set1_epi32(0x00FF00FF); @@ -416,7 +416,7 @@ namespace bitfieldInterleave static inline glm::uint64 sseUnalignedBitfieldInterleave(glm::uint32 x, glm::uint32 y) { - __m128i const Array = _mm_set_epi32(0, y, 0, x); + __m128i const Array = _mm_set_epi32(0, static_cast(y), 0, static_cast(x)); __m128i const Mask4 = _mm_set1_epi32(0x0000FFFF); __m128i const Mask3 = _mm_set1_epi32(0x00FF00FF);