From 69514dfd46ede1f2b561e0ffcbe85432c3866016 Mon Sep 17 00:00:00 2001
From: bzzt lost a hitlab login <bzzt@bzzt.bzzt>
Date: Mon, 4 May 2020 13:37:00 +0000
Subject: [PATCH] ico redundency fix + stats counter

Signed-off-by: Bret Curtis <psi29a@gmail.com>
---
 apps/openmw/mwrender/objectpaging.cpp | 17 +++++++++++++----
 apps/openmw/mwrender/objectpaging.hpp |  2 ++
 components/resource/scenemanager.cpp  |  7 ++++++-
 components/resource/stats.cpp         |  1 +
 4 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/apps/openmw/mwrender/objectpaging.cpp b/apps/openmw/mwrender/objectpaging.cpp
index 6393bfc76e..28644cecf3 100644
--- a/apps/openmw/mwrender/objectpaging.cpp
+++ b/apps/openmw/mwrender/objectpaging.cpp
@@ -463,14 +463,17 @@ namespace MWRender
             group->addChild(mergeGroup);
 
             auto ico = mSceneManager->getIncrementalCompileOperation();
-            if (compile && ico) ico->add(mergeGroup);
+            if (compile && ico)
+            {
+                auto compileSet = new osgUtil::IncrementalCompileOperation::CompileSet(mergeGroup);
+                ico->add(compileSet);
+                compileSet->_subgraphToCompile = group; // for ref counting in SceneManager::updateCache
+            }
         }
 
         group->getBound();
         group->setNodeMask(Mask_Static);
-        osg::UserDataContainer* udc = group->getOrCreateUserDataContainer();
-        udc->addUserObject(templateRefs);
-        udc->addUserObject(mergeGroup); // for ICO ref counting
+        group->getOrCreateUserDataContainer()->addUserObject(templateRefs);
 
         return group;
     }
@@ -492,4 +495,10 @@ namespace MWRender
         OpenThreads::ScopedLock<OpenThreads::Mutex> lock(mDisabledMutex);
         mDisabled.clear();
     }
+
+    void ObjectPaging::reportStats(unsigned int frameNumber, osg::Stats *stats) const
+    {
+        stats->setAttribute(frameNumber, "Object Chunk", mCache->getCacheSize());
+    }
+
 }
diff --git a/apps/openmw/mwrender/objectpaging.hpp b/apps/openmw/mwrender/objectpaging.hpp
index 56f393c7b6..9fb3aa7541 100644
--- a/apps/openmw/mwrender/objectpaging.hpp
+++ b/apps/openmw/mwrender/objectpaging.hpp
@@ -36,6 +36,8 @@ namespace MWRender
         void enableObject(const ESM::RefNum & refnum, bool enabled);
         void clear();
 
+        void reportStats(unsigned int frameNumber, osg::Stats* stats) const override;
+
     private:
         Resource::SceneManager* mSceneManager;
         float mMergeFactor;
diff --git a/components/resource/scenemanager.cpp b/components/resource/scenemanager.cpp
index f4a605bca9..29b312670c 100644
--- a/components/resource/scenemanager.cpp
+++ b/components/resource/scenemanager.cpp
@@ -720,8 +720,13 @@ namespace Resource
             osgUtil::IncrementalCompileOperation::CompileSets& sets = mIncrementalCompileOperation->getToCompile();
             for(osgUtil::IncrementalCompileOperation::CompileSets::iterator it = sets.begin(); it != sets.end();)
             {
-                if ((*it)->_subgraphToCompile->referenceCount() <= 2)
+                int refcount = (*it)->_subgraphToCompile->referenceCount();
+                if ((*it)->_subgraphToCompile->asDrawable()) refcount -= 1; // ref by CompileList.
+                if (refcount <= 2) // ref by ObjectCache + ref by _subgraphToCompile.
+                {
+                    // no other ref = not needed anymore.
                     it = sets.erase(it);
+                }
                 else
                     ++it;
             }
diff --git a/components/resource/stats.cpp b/components/resource/stats.cpp
index 0dd52ffb6a..2dda2c2dfa 100644
--- a/components/resource/stats.cpp
+++ b/components/resource/stats.cpp
@@ -292,6 +292,7 @@ void StatsHandler::setUpScene(osgViewer::ViewerBase *viewer)
             "Nif",
             "Keyframe",
             "",
+            "Object Chunk",
             "Terrain Chunk",
             "Terrain Texture",
             "Land",