summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiaohong Bao <bao@lindenlab.com>2013-09-09 11:25:10 -0600
committerXiaohong Bao <bao@lindenlab.com>2013-09-09 11:25:10 -0600
commitf04fe8010ab1a0c980ecd197f37da66a7fda0ad6 (patch)
treec4633c22f1373db12939e4040bd2f03a88956da4
parent736efc7b574635d5c86a97a33b456dd79a035777 (diff)
cancel redundant memory alignments for some base classes to get better memory performance
-rw-r--r--indra/newview/llvieweroctree.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llvieweroctree.h b/indra/newview/llvieweroctree.h
index e610db96eb..97dc1d4a0a 100644
--- a/indra/newview/llvieweroctree.h
+++ b/indra/newview/llvieweroctree.h
@@ -70,7 +70,7 @@ S32 AABBSphereIntersect(const LLVector3& min, const LLVector3& max, const LLVect
S32 AABBSphereIntersectR2(const LLVector3& min, const LLVector3& max, const LLVector3 &origin, const F32 &radius_squared);
//defines data needed for octree of an entry
-LL_ALIGN_PREFIX(16)
+//LL_ALIGN_PREFIX(16)
class LLViewerOctreeEntry : public LLRefCount
{
friend class LLViewerOctreeEntryData;
@@ -128,10 +128,10 @@ private:
mutable S32 mBinIndex;
mutable U32 mVisible;
-} LL_ALIGN_POSTFIX(16);
+} ;//LL_ALIGN_POSTFIX(16);
//defines an abstract class for entry data
-LL_ALIGN_PREFIX(16)
+//LL_ALIGN_PREFIX(16)
class LLViewerOctreeEntryData : public LLRefCount
{
protected:
@@ -178,11 +178,11 @@ protected:
LLPointer<LLViewerOctreeEntry> mEntry;
LLViewerOctreeEntry::eEntryDataType_t mDataType;
static U32 sCurVisible; // Counter for what value of mVisible means currently visible
-}LL_ALIGN_POSTFIX(16);
+};//LL_ALIGN_POSTFIX(16);
//defines an octree group for an octree node, which contains multiple entries.
-LL_ALIGN_PREFIX(16)
+//LL_ALIGN_PREFIX(16)
class LLviewerOctreeGroup : public LLOctreeListener<LLViewerOctreeEntry>
{
friend class LLViewerOctreeCull;
@@ -279,7 +279,7 @@ protected:
public:
S32 mVisible[LLViewerCamera::NUM_CAMERAS];
-}LL_ALIGN_POSTFIX(16);
+};//LL_ALIGN_POSTFIX(16);
//octree group which has capability to support occlusion culling
//LL_ALIGN_PREFIX(16)