diff options
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpolymesh.cpp | 8 | ||||
| -rw-r--r-- | indra/newview/llvograss.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index d0164c1033..d10e4fee3a 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -141,7 +141,7 @@ void LLPolyMeshSharedData::freeMeshData() delete [] mDetailTexCoords; mDetailTexCoords = NULL; - _mm_free(mWeights); + ll_aligned_free_16(mWeights); mWeights = NULL; } @@ -231,7 +231,7 @@ BOOL LLPolyMeshSharedData::allocateVertexData( U32 numVertices ) mBaseBinormals = new LLVector3[ numVertices ]; mTexCoords = new LLVector2[ numVertices ]; mDetailTexCoords = new LLVector2[ numVertices ]; - mWeights = (F32*) _mm_malloc((numVertices*sizeof(F32)+0xF) & ~0xF, 16); + mWeights = (F32*) ll_aligned_malloc_16((numVertices*sizeof(F32)+0xF) & ~0xF); for (i = 0; i < numVertices; i++) { mWeights[i] = 0.f; @@ -716,7 +716,7 @@ LLPolyMesh::LLPolyMesh(LLPolyMeshSharedData *shared_data, LLPolyMesh *reference_ int nfloats = nverts * (2*4 + 3*3 + 2 + 4); //use aligned vertex data to make LLPolyMesh SSE friendly - mVertexData = (F32*) ll_aligned_malloc(nfloats*4, 16); + mVertexData = (F32*) ll_aligned_malloc_16(nfloats*4); int offset = 0; //all members must be 16-byte aligned except the last 3 @@ -767,7 +767,7 @@ LLPolyMesh::~LLPolyMesh() delete [] mClothingWeights; delete [] mTexCoords; #else - ll_aligned_free(mVertexData); + ll_aligned_free_16(mVertexData); #endif } diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index edb97eef24..b40e6af496 100644 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -596,7 +596,7 @@ BOOL LLVOGrass::lineSegmentIntersect(const LLVector3& start, const LLVector3& en LLVector3 v[4]; // LLVector3 n[4]; // unused! - F32 closest_t = 1.f; + // F32 closest_t = 1.f; // unused! for (S32 i = 0; i < mNumBlades; i++) { |