summaryrefslogtreecommitdiff
path: root/indra/llcommon/llmemory.h
diff options
context:
space:
mode:
authorAnchor <none@none>2018-11-28 15:16:01 -0800
committerAnchor <none@none>2018-11-28 15:16:01 -0800
commit014480a79b765587881d0c0f707a7ee191f5fe2e (patch)
tree4d759c7b996065cccb9171a51a1a3f05d04b6e31 /indra/llcommon/llmemory.h
parent076719013ec2dab7bf8fd1f4d1f953ab73d594e9 (diff)
parent8558ce5c600b810356010ba3cd6d534ef22f4081 (diff)
Merge
Diffstat (limited to 'indra/llcommon/llmemory.h')
-rw-r--r--indra/llcommon/llmemory.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llcommon/llmemory.h b/indra/llcommon/llmemory.h
index 5b17d9e3a4..f04ae5f5cb 100644
--- a/indra/llcommon/llmemory.h
+++ b/indra/llcommon/llmemory.h
@@ -60,6 +60,12 @@ class LLMutex ;
LL_COMMON_API void ll_assert_aligned_func(uintptr_t ptr,U32 alignment);
#ifdef SHOW_ASSERT
+// This is incredibly expensive - in profiling Windows RWD builds, 30%
+// of CPU time was in aligment checks.
+//#define ASSERT_ALIGNMENT
+#endif
+
+#ifdef ASSERT_ALIGNMENT
#define ll_assert_aligned(ptr,alignment) ll_assert_aligned_func(uintptr_t(ptr),((U32)alignment))
#else
#define ll_assert_aligned(ptr,alignment)