diff options
| author | Richard Linden <none@none> | 2013-10-01 13:47:15 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-10-01 13:47:15 -0700 |
| commit | 9e486f6c6abbee6cb41ba9a6271d8a025ad924ef (patch) | |
| tree | e6a8d1de4fc9fa4e8eff575d4ab430f7a72a4170 /indra/llrender/llvertexbuffer.cpp | |
| parent | 1aa9ad575488eb1f808f3bfcb5f0ffa1e8e95591 (diff) | |
| parent | 12f0f8cb72f789e21b01b45063dcc5f1f5292087 (diff) | |
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/llrender/llvertexbuffer.cpp')
| -rwxr-xr-x | indra/llrender/llvertexbuffer.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index b1a5a194be..38351dd9ae 100755 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -959,7 +959,8 @@ S32 LLVertexBuffer::determineUsage(S32 usage) return ret_usage; } -LLVertexBuffer::LLVertexBuffer(U32 typemask, S32 usage) : +LLVertexBuffer::LLVertexBuffer(U32 typemask, S32 usage) +: LLTrace::MemTrackable<LLVertexBuffer>("LLVertexBuffer"), LLRefCount(), mNumVerts(0), @@ -1096,7 +1097,9 @@ void LLVertexBuffer::waitFence() const void LLVertexBuffer::genBuffer(U32 size) { + disclaimMem(mSize); mSize = vbo_block_size(size); + claimMem(mSize); if (mUsage == GL_STREAM_DRAW_ARB) { @@ -1185,7 +1188,9 @@ void LLVertexBuffer::createGLBuffer(U32 size) static int gl_buffer_idx = 0; mGLBuffer = ++gl_buffer_idx; mMappedData = (U8*)ALLOCATE_MEM(sPrivatePoolp, size); + disclaimMem(mSize); mSize = size; + disclaimMem(mSize); } } |