From 4ec72ed0a61157dd5fcc1bc4cc91054664ee75b5 Mon Sep 17 00:00:00 2001 From: Dave Parks Date: Wed, 19 Oct 2011 16:19:00 -0500 Subject: Fix for VBO pools not getting cleared appropriately. --- indra/llrender/llvertexbuffer.cpp | 1 + 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(); -- cgit v1.2.3