Skip to content
Snippets Groups Projects
Commit f30d95ee authored by Brad Payne (Vir Linden)'s avatar Brad Payne (Vir Linden)
Browse files

SL-915 - more on alignment for 32-bit

parent 430f9420
No related branches found
No related tags found
No related merge requests found
...@@ -86,7 +86,8 @@ void LLJointRiggingInfo::merge(const LLJointRiggingInfo& other) ...@@ -86,7 +86,8 @@ void LLJointRiggingInfo::merge(const LLJointRiggingInfo& other)
LLJointRiggingInfoTab::LLJointRiggingInfoTab(): LLJointRiggingInfoTab::LLJointRiggingInfoTab():
mRigInfoPtr(NULL), mRigInfoPtr(NULL),
mSize(0) mSize(0),
mNeedsUpdate(true)
{ {
} }
......
...@@ -55,6 +55,17 @@ class LLJointRiggingInfo ...@@ -55,6 +55,17 @@ class LLJointRiggingInfo
ll_aligned_free_16(ptr); ll_aligned_free_16(ptr);
} }
void* operator new[](size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete[](void* ptr)
{
ll_aligned_free_16(ptr);
}
private: private:
LL_ALIGN_16(LLVector4a mRiggedExtents[2]); LL_ALIGN_16(LLVector4a mRiggedExtents[2]);
bool mIsRiggedTo; bool mIsRiggedTo;
...@@ -74,6 +85,8 @@ class LLJointRiggingInfoTab ...@@ -74,6 +85,8 @@ class LLJointRiggingInfoTab
void merge(const LLJointRiggingInfoTab& src); void merge(const LLJointRiggingInfoTab& src);
LLJointRiggingInfo& operator[](S32 i) { return mRigInfoPtr[i]; } LLJointRiggingInfo& operator[](S32 i) { return mRigInfoPtr[i]; }
const LLJointRiggingInfo& operator[](S32 i) const { return mRigInfoPtr[i]; }; const LLJointRiggingInfo& operator[](S32 i) const { return mRigInfoPtr[i]; };
bool needsUpdate() { return mNeedsUpdate; }
void setNeedsUpdate(bool val) { mNeedsUpdate = val; }
private: private:
// Not implemented // Not implemented
LLJointRiggingInfoTab& operator=(const LLJointRiggingInfoTab& src); LLJointRiggingInfoTab& operator=(const LLJointRiggingInfoTab& src);
...@@ -81,6 +94,7 @@ class LLJointRiggingInfoTab ...@@ -81,6 +94,7 @@ class LLJointRiggingInfoTab
LLJointRiggingInfo *mRigInfoPtr; LLJointRiggingInfo *mRigInfoPtr;
S32 mSize; S32 mSize;
bool mNeedsUpdate;
}; };
#endif #endif
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment