Alignment fixes.

This commit is contained in:
Shyotl
2014-11-26 22:53:32 -06:00
parent f5204cc8f5
commit 36a8a20434
9 changed files with 90 additions and 0 deletions

View File

@@ -127,6 +127,16 @@ public:
LLAvatarJointCollisionVolume();
virtual ~LLAvatarJointCollisionVolume() {};
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
/*virtual*/ BOOL inheritScale() { return TRUE; }
/*virtual*/ U32 render( F32 pixelArea, BOOL first_pass = TRUE, BOOL is_dummy = FALSE );

View File

@@ -163,6 +163,16 @@ public:
LLPolyMorphTarget(LLPolyMesh *poly_mesh);
~LLPolyMorphTarget();
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
// Special: These functions are overridden by child classes
LLPolyMorphTargetInfo* getInfo() const { return (LLPolyMorphTargetInfo*)mInfo; }
// This sets mInfo and calls initialization functions

View File

@@ -58,6 +58,16 @@ public:
// Destructor
virtual ~LLEditingMotion();
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
public:
//-------------------------------------------------------------------------
// functions to support MotionController and MotionRegistry

View File

@@ -53,6 +53,16 @@ public:
// Destructor
virtual ~LLKeyframeStandMotion();
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
public:
//-------------------------------------------------------------------------
// functions to support MotionController and MotionRegistry

View File

@@ -96,6 +96,16 @@ protected:
public:
LLJointStateBlender();
~LLJointStateBlender();
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
void blendJointStates(BOOL apply_now = TRUE);
BOOL addJointState(const LLPointer<LLJointState>& joint_state, S32 priority, BOOL additive_blend);
void interpolate(F32 u);

View File

@@ -27,6 +27,16 @@ public:
void update();
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
private:
virtual ~LLFloaterExploreAnimations();

View File

@@ -49,6 +49,16 @@ public:
LLViewerJoint(const std::string &name, LLJoint *parent = NULL);
virtual ~LLViewerJoint();
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
// Render character hierarchy.
// Traverses the entire joint hierarchy, setting up
// transforms and calling the drawShape().

View File

@@ -47,6 +47,16 @@ public:
LLViewerJointAttachment();
virtual ~LLViewerJointAttachment();
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
//virtual U32 render( F32 pixelArea ); // Returns triangle count
// Returns true if this object is transparent.

View File

@@ -50,6 +50,16 @@ public:
// Destructor
virtual ~LLViewerJointMesh();
void* operator new(size_t size)
{
return ll_aligned_malloc_16(size);
}
void operator delete(void* ptr)
{
ll_aligned_free_16(ptr);
}
// Render time method to upload batches of joint matrices
void uploadJointMatrices();