diff options
author | Dave Parks <davep@lindenlab.com> | 2012-01-25 15:37:36 -0600 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2012-01-25 15:37:36 -0600 |
commit | 0bbe8d73cb687e34d1b10c58b67c465df076739c (patch) | |
tree | 9eb9a7fb850d02d43161ba00bffb096f529a407c /indra/llrender | |
parent | 9e621af3db9fbb0728bf7b338ea4e17c56ab25bb (diff) |
SH-2565 Move resetVertexBuffer operation to a consistent location (also avoid redundant resetting of vertex buffers on detail switches). Change assertion to a warning with count info. Fix bytes pooled debug display. Remove unused static vertex buffer.
Diffstat (limited to 'indra/llrender')
-rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index eb302392bb..518f3898a4 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -205,14 +205,13 @@ void LLVBOPool::release(U32 name, volatile U8* buffer, U32 size) rec.mGLName = name; rec.mClientData = buffer; - sBytesPooled += size; - if (!LLVertexBuffer::sDisableVBOMapping && mUsage == GL_DYNAMIC_DRAW_ARB) { glDeleteBuffersARB(1, &rec.mGLName); } else { + sBytesPooled += size; mFreeList[i].push_back(rec); } } |