diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-21 15:11:16 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-05-21 15:11:16 +0100 |
| commit | ab31e3bb217089e0cc28ca57bb5c4e46c06789dd (patch) | |
| tree | b398183e8f5a7ecf5593c6bb0a2a73cf3f2f1073 /indra/newview/llpolymesh.cpp | |
| parent | cd13bc0e044d5014a0d7e131ae9d47924e376997 (diff) | |
Fix up the SSE stuff so it compiles on Linux. Though I don't think it actually works properly.
Diffstat (limited to 'indra/newview/llpolymesh.cpp')
| -rw-r--r-- | indra/newview/llpolymesh.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llpolymesh.cpp b/indra/newview/llpolymesh.cpp index b8bdbfb2f8..af3c3e2b16 100644 --- a/indra/newview/llpolymesh.cpp +++ b/indra/newview/llpolymesh.cpp @@ -35,7 +35,8 @@ //----------------------------------------------------------------------------- #include "llviewerprecompiledheaders.h" -#include "llpolymesh.h" +#include "llfasttimer.h" +#include "llmemory.h" #include "llviewercontrol.h" #include "llxmltree.h" @@ -45,7 +46,7 @@ #include "llvolume.h" #include "llendianswizzle.h" -#include "llfasttimer.h" +#include "llpolymesh.h" #define HEADER_ASCII "Linden Mesh 1.0" #define HEADER_BINARY "Linden Binary Mesh 1.0" @@ -715,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*) _mm_malloc(nfloats*4, 16); + mVertexData = (F32*) ll_aligned_malloc(nfloats*4, 16); int offset = 0; mCoords = (LLVector4*)(mVertexData + offset); offset += 4*nverts; mNormals = (LLVector4*)(mVertexData + offset); offset += 4*nverts; @@ -759,7 +760,7 @@ LLPolyMesh::~LLPolyMesh() delete [] mClothingWeights; delete [] mTexCoords; #else - _mm_free(mVertexData); + ll_aligned_free(mVertexData); #endif } |