From cad45e96ac4b9f66448b5a8ebde23433e0487957 Mon Sep 17 00:00:00 2001 From: Andrei Kortunov Date: Thu, 21 Mar 2019 08:42:48 +0400 Subject: [PATCH] Remove redundant mCompile set - we do not use data from it anyway --- components/terrain/compositemaprenderer.cpp | 4 ---- components/terrain/compositemaprenderer.hpp | 2 -- 2 files changed, 6 deletions(-) diff --git a/components/terrain/compositemaprenderer.cpp b/components/terrain/compositemaprenderer.cpp index 3fc56a8821..355ef6c16f 100644 --- a/components/terrain/compositemaprenderer.cpp +++ b/components/terrain/compositemaprenderer.cpp @@ -47,8 +47,6 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const double availableTime = std::max((targetFrameTime - dt)*conservativeTimeRatio, mMinimumTimeAvailable); - mCompiled.clear(); - if (mWorkQueue) mUnrefQueue->flush(mWorkQueue.get()); @@ -60,7 +58,6 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const while (!mImmediateCompileSet.empty()) { osg::ref_ptr node = *mImmediateCompileSet.begin(); - mCompiled.insert(node); mImmediateCompileSet.erase(node); mMutex.unlock(); @@ -80,7 +77,6 @@ void CompositeMapRenderer::drawImplementation(osg::RenderInfo &renderInfo) const if (node->mCompiled >= node->mDrawables.size()) { - mCompiled.insert(node); mCompileSet.erase(node); } } diff --git a/components/terrain/compositemaprenderer.hpp b/components/terrain/compositemaprenderer.hpp index 5c81fdca65..201130e303 100644 --- a/components/terrain/compositemaprenderer.hpp +++ b/components/terrain/compositemaprenderer.hpp @@ -76,8 +76,6 @@ namespace Terrain mutable CompileSet mCompileSet; mutable CompileSet mImmediateCompileSet; - mutable CompileSet mCompiled; - mutable OpenThreads::Mutex mMutex; osg::ref_ptr mFBO;