diff options
author | Graham Linden <graham@lindenlab.com> | 2018-11-15 14:32:18 -0800 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2018-11-15 14:32:18 -0800 |
commit | ba1fbddc2dbc526ee89e7d79b35cf3e0a46e3add (patch) | |
tree | d779020d73e73a8eb9fa8731c362b8708c8837ef /indra/llcommon/llmemory.h | |
parent | 2783783575a9b712eb318b450dc5e6bb17d7f7c5 (diff) | |
parent | a0a1d93fb6a74149bbef57f1d1489510247110ca (diff) |
Merge 6ish
Diffstat (limited to 'indra/llcommon/llmemory.h')
-rw-r--r-- | indra/llcommon/llmemory.h | 6 |
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) |