diff options
author | Dave Parks <davep@lindenlab.com> | 2011-10-19 16:19:00 -0500 |
---|---|---|
committer | Dave Parks <davep@lindenlab.com> | 2011-10-19 16:19:00 -0500 |
commit | 4ec72ed0a61157dd5fcc1bc4cc91054664ee75b5 (patch) | |
tree | 3e445ab899f4fa80112dd26838448a85b7ff42b2 /indra | |
parent | b17023e3b071f5e49b3a18c28fc8e1bc73c15b73 (diff) |
Fix for VBO pools not getting cleared appropriately.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llrender/llvertexbuffer.cpp | 1 | ||||
-rw-r--r-- | indra/newview/pipeline.cpp | 7 |
2 files changed, 3 insertions, 5 deletions
diff --git a/indra/llrender/llvertexbuffer.cpp b/indra/llrender/llvertexbuffer.cpp index ad99bd1807..7f73977010 100644 --- a/indra/llrender/llvertexbuffer.cpp +++ b/indra/llrender/llvertexbuffer.cpp @@ -227,6 +227,7 @@ void LLVBOPool::cleanup() l.pop_front(); LLVertexBuffer::sAllocatedBytes -= size; + sBytesPooled -= size; } size *= 2; diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 3246ec648e..acd708e800 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -6109,11 +6109,8 @@ void LLPipeline::resetVertexBuffers() gSky.resetVertexBuffers(); - if (LLVertexBuffer::sGLCount > 0) - { - LLVertexBuffer::cleanupClass(); - } - + LLVertexBuffer::cleanupClass(); + //delete all name pool caches LLGLNamePool::cleanupPools(); |