From 246a3d83ea134cf6e9d6b3544e1f6bd1794317c7 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Thu, 12 Mar 2020 16:20:19 -0400
Subject: [PATCH] Oops. Forgot to change this to the wrapper call.
---
indra/llcommon/lluuid.h | 4 ++--
indra/llprimitive/llmaterialid.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/llcommon/lluuid.h b/indra/llcommon/lluuid.h
index fa48ee6bdbb..69894a4b53e 100644
--- a/indra/llcommon/lluuid.h
+++ b/indra/llcommon/lluuid.h
@@ -138,8 +138,8 @@ class LL_COMMON_API LLUUID
bool operator<(const LLUUID& rhs) const
{
- __m128i mm_left = _mm_lddqu_si128(reinterpret_cast<const __m128i*>(mData));
- __m128i mm_right = _mm_lddqu_si128(reinterpret_cast<const __m128i*>(rhs.mData));
+ __m128i mm_left = load_unaligned_si128(mData);
+ __m128i mm_right = load_unaligned_si128(rhs.mData);
// To emulate lexicographical_compare behavior we have to perform two comparisons - the forward and reverse one.
// Then we know which bytes are equivalent and which ones are different, and for those different the comparison results
diff --git a/indra/llprimitive/llmaterialid.h b/indra/llprimitive/llmaterialid.h
index 3f7a0bb3ed6..549f723352c 100644
--- a/indra/llprimitive/llmaterialid.h
+++ b/indra/llprimitive/llmaterialid.h
@@ -79,8 +79,8 @@ class LLMaterialID
bool operator<(const LLMaterialID& rhs) const
{
- __m128i mm_left = _mm_lddqu_si128(reinterpret_cast<const __m128i*>(mID));
- __m128i mm_right = _mm_lddqu_si128(reinterpret_cast<const __m128i*>(rhs.mID));
+ __m128i mm_left = load_unaligned_si128(mID);
+ __m128i mm_right = load_unaligned_si128(rhs.mID);
// To emulate lexicographical_compare behavior we have to perform two comparisons - the forward and reverse one.
// Then we know which bytes are equivalent and which ones are different, and for those different the comparison results
--
GitLab