diff options
author | Oz Linden <oz@lindenlab.com> | 2012-06-27 14:18:22 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-06-27 14:18:22 -0400 |
commit | 2c3e78f1f1f5851482e5e63d37af1325f3a19550 (patch) | |
tree | 1871ea15c18377defe5e20a198baf8072e791efc /indra/newview/lldrawable.h | |
parent | eb03da6e993eb33e1fef9bf53268c66d325adf9a (diff) | |
parent | c9f1b1b5113031d5879e8fcdcec263626a7d3122 (diff) |
merge changes for DRTVWR-167
Diffstat (limited to 'indra/newview/lldrawable.h')
-rwxr-xr-x[-rw-r--r--] | indra/newview/lldrawable.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index e2064b79f8..8c7db61502 100644..100755 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -59,6 +59,7 @@ class LLViewerTexture; const U32 SILHOUETTE_HIGHLIGHT = 0; // All data for new renderer goes into this class. +LL_ALIGN_PREFIX(16) class LLDrawable : public LLRefCount { public: @@ -75,6 +76,16 @@ public: static void initClass(); + void* operator new(size_t size) + { + return ll_aligned_malloc_16(size); + } + + void operator delete(void* ptr) + { + ll_aligned_free_16(ptr); + } + LLDrawable() { init(); } MEM_TYPE_NEW(LLMemType::MTYPE_DRAWABLE); @@ -281,8 +292,8 @@ public: } EDrawableFlags; private: //aligned members - LLVector4a mExtents[2]; - LLVector4a mPositionGroup; + LL_ALIGN_16(LLVector4a mExtents[2]); + LL_ALIGN_16(LLVector4a mPositionGroup); public: LLXformMatrix mXform; @@ -323,7 +334,7 @@ private: static U32 sNumZombieDrawables; static LLDynamicArrayPtr<LLPointer<LLDrawable> > sDeadList; -}; +} LL_ALIGN_POSTFIX(16); inline LLFace* LLDrawable::getFace(const S32 i) const |