diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-11-21 05:09:59 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-11-21 05:09:59 -0600 |
| commit | 2915715ec4a9bb7978c4a0db0afc26b73ab8b2fb (patch) | |
| tree | 1646677894d56b176a38fe21f75c48e1de9003c9 /indra/newview/llpolymesh.cpp | |
| parent | 4b5ddf1c41622e48bff79eba3f9bc50e73a1efb6 (diff) | |
Remove dependency on ll_align_malloc/free from avatar.
Diffstat (limited to 'indra/newview/llpolymesh.cpp')
| -rw-r--r-- | indra/newview/llpolymesh.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index 2a14355061..c6425ed283 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -135,7 +135,7 @@ void LLPolyMeshSharedData::freeMeshData() delete [] mDetailTexCoords; mDetailTexCoords = NULL; - ll_aligned_free_16(mWeights); + free(mWeights); mWeights = NULL; } @@ -225,7 +225,7 @@ BOOL LLPolyMeshSharedData::allocateVertexData( U32 numVertices ) mBaseBinormals = new LLVector3[ numVertices ]; mTexCoords = new LLVector2[ numVertices ]; mDetailTexCoords = new LLVector2[ numVertices ]; - mWeights = (F32*) ll_aligned_malloc_16((numVertices*sizeof(F32)+0xF) & ~0xF); + mWeights = (F32*) malloc((numVertices*sizeof(F32)+0xF) & ~0xF); for (i = 0; i < numVertices; i++) { mWeights[i] = 0.f; @@ -709,8 +709,8 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_ int nverts = mSharedData->mNumVertices; int nfloats = nverts * (2*4 + 3*3 + 2 + 4); - //use aligned vertex data to make LLPolyMesh SSE friendly - mVertexData = (F32*) ll_aligned_malloc_16(nfloats*4); + //use 16 byte aligned vertex data to make LLPolyMesh SSE friendly + mVertexData = (F32*) malloc(nfloats*4); int offset = 0; //all members must be 16-byte aligned except the last 3 @@ -761,7 +761,7 @@ LLPolyMesh::~LLPolyMesh() delete [] mClothingWeights; delete [] mTexCoords; #else - ll_aligned_free_16(mVertexData); + free(mVertexData); #endif } |