organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-05 05:25:02 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

gne

Browse source
This commit is contained in:
Christophe 2024-01-18 14:13:00 +01:00
parent 76bedc9092
commit 71022f54f2
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
glm/detail/func_integer_simd.inl
View file

@ -14,7 +14,7 @@ namespace detail
__m128i const set1 = _mm_set1_epi32(static_cast<int>(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<int>(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<int>(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<int>(Shift));
__m128i const and1 = _mm_and_si128(sft0, set1);
__m128i const add0 = _mm_add_epi32(and0, and1);

1
test/gtc/gtc_quaternion.cpp
View file

@ -133,7 +133,6 @@ static int test_quat_slerp()
float sqrt2 = std::sqrt(2.0f)/2.0f;
glm::quat id(static_cast<float>(1), static_cast<float>(0), static_cast<float>(0), static_cast<float>(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