diff options
author | Oz Linden <oz@lindenlab.com> | 2012-09-11 08:47:33 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-09-11 08:47:33 -0400 |
commit | 5eb6614913b97963d185afe698e677c880399c78 (patch) | |
tree | c7e342b7b68192fc0eb4eba09ef52c17ac16ffa5 /indra/llmath/llvector4a.inl | |
parent | 8189b28d2247bf99f76ace63e78021a43b5e15a1 (diff) | |
parent | 2aadccd30843f3a29882d13ed2db50cebcba0374 (diff) |
merge changes for DRTVWR-212
Diffstat (limited to 'indra/llmath/llvector4a.inl')
-rw-r--r-- | indra/llmath/llvector4a.inl | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llmath/llvector4a.inl b/indra/llmath/llvector4a.inl index 7c52ffef21..7ad22a5631 100644 --- a/indra/llmath/llvector4a.inl +++ b/indra/llmath/llvector4a.inl @@ -475,7 +475,6 @@ inline void LLVector4a::setLerp(const LLVector4a& lhs, const LLVector4a& rhs, F3 inline LLBool32 LLVector4a::isFinite3() const { static LL_ALIGN_16(const U32 nanOrInfMask[4]) = { 0x7f800000, 0x7f800000, 0x7f800000, 0x7f800000 }; - ll_assert_aligned(nanOrInfMask,16); const __m128i nanOrInfMaskV = *reinterpret_cast<const __m128i*> (nanOrInfMask); const __m128i maskResult = _mm_and_si128( _mm_castps_si128(mQ), nanOrInfMaskV ); const LLVector4Logical equalityCheck = _mm_castsi128_ps(_mm_cmpeq_epi32( maskResult, nanOrInfMaskV )); |