From 71022f54f275571253868a2980767bb15fe9ff8e Mon Sep 17 00:00:00 2001 From: Christophe Date: Thu, 18 Jan 2024 14:13:00 +0100 Subject: [PATCH] gne --- glm/detail/func_integer_simd.inl | 4 ++-- test/gtc/gtc_quaternion.cpp | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/glm/detail/func_integer_simd.inl b/glm/detail/func_integer_simd.inl index 8be6c9ce4..36f911922 100644 --- a/glm/detail/func_integer_simd.inl +++ b/glm/detail/func_integer_simd.inl @@ -14,7 +14,7 @@ namespace detail __m128i const set1 = _mm_set1_epi32(static_cast(Mask)); __m128i const and1 = _mm_and_si128(set0, set1); - __m128i const sft1 = _mm_slli_epi32(and1, Shift); + __m128i const sft1 = _mm_slli_epi32(and1, static_cast(Shift)); __m128i const set2 = _mm_andnot_si128(set0, _mm_set1_epi32(-1)); __m128i const and2 = _mm_and_si128(set0, set2); @@ -35,7 +35,7 @@ namespace detail __m128i const set1 = _mm_set1_epi32(static_cast(Mask)); __m128i const and0 = _mm_and_si128(set0, set1); - __m128i const sft0 = _mm_slli_epi32(set0, Shift); + __m128i const sft0 = _mm_slli_epi32(set0, static_cast(Shift)); __m128i const and1 = _mm_and_si128(sft0, set1); __m128i const add0 = _mm_add_epi32(and0, and1); diff --git a/test/gtc/gtc_quaternion.cpp b/test/gtc/gtc_quaternion.cpp index 58446ae56..975ac71c9 100644 --- a/test/gtc/gtc_quaternion.cpp +++ b/test/gtc/gtc_quaternion.cpp @@ -133,7 +133,6 @@ static int test_quat_slerp() float sqrt2 = std::sqrt(2.0f)/2.0f; glm::quat id(static_cast(1), static_cast(0), static_cast(0), static_cast(0)); glm::quat Y90rot(sqrt2, 0.0f, sqrt2, 0.0f); - glm::quat Y180rot(0.0f, 0.0f, 1.0f, 0.0f); // Testing a == 0 // Must be id