diff options
author | Richard Linden <none@none> | 2013-10-14 10:18:41 -0700 |
---|---|---|
committer | Richard Linden <none@none> | 2013-10-14 10:18:41 -0700 |
commit | 1acceb3633c0f0c4fdf29b17d77d67c8a9b71986 (patch) | |
tree | 7fef10e1031417a866243a90df43654ad4659aca /indra/llrender | |
parent | a6a40bd69f2011337b138d833d412b2b3568f8ea (diff) |
changed ll_aligned_(malloc|free) to take alignment size as a template argument
Diffstat (limited to 'indra/llrender')
-rwxr-xr-x | indra/llrender/llvertexbuffer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index 2a36a3b96f..3bbbccbad1 100755 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -202,7 +202,7 @@ volatile U8* LLVBOPool::allocate(U32& name, U32 size, bool for_seed) glBufferDataARB(mType, size, 0, mUsage); if (mUsage != GL_DYNAMIC_COPY_ARB) { //data will be provided by application - ret = (U8*) ll_aligned_malloc(64, size); + ret = (U8*) ll_aligned_malloc<64>(size); } } else @@ -310,7 +310,7 @@ void LLVBOPool::cleanup() if (r.mClientData) { - ll_aligned_free(64, (void*) r.mClientData); + ll_aligned_free<64>((void*) r.mClientData); } l.pop_front(); |