Make the MaliHwCounters singleton

AnKi/Core/App.cpp

@@ -136,8 +136,7 @@ void App::cleanup()
 	UnifiedGeometryMemoryPool::freeSingleton();
 	GpuSceneMemoryPool::freeSingleton();
 	CoreThreadHive::freeSingleton();
-	deleteInstance(m_mainPool, m_maliHwCounters);
-	m_maliHwCounters = nullptr;
+	MaliHwCounters::freeSingleton();
 	GrManager::deleteInstance(m_gr);
 	m_gr = nullptr;
 	Input::freeSingleton();
@@ -278,7 +277,7 @@ Error App::initInternal(AllocAlignedCallback allocCb, void* allocCbUserData)
 	if(m_gr->getDeviceCapabilities().m_gpuVendor == GpuVendor::kArm
 	   && ConfigSet::getSingleton().getCoreMaliHwCounters())
 	{
-		m_maliHwCounters = newInstance<MaliHwCounters>(m_mainPool, &m_mainPool);
+		MaliHwCounters::allocateSingleton();
 	}
 
 	//
@@ -562,10 +561,10 @@ Error App::mainLoop()
 
 				in.m_gpuFrameTime = m_renderer->getStats().m_renderingGpuTime;
 
-				if(m_maliHwCounters)
+				if(MaliHwCounters::isAllocated())
 				{
 					MaliHwCountersOut out;
-					m_maliHwCounters->sample(out);
+					MaliHwCounters::getSingleton().sample(out);
 					in.m_gpuActiveCycles = out.m_gpuActive;
 					in.m_gpuReadBandwidth = out.m_readBandwidth;
 					in.m_gpuWriteBandwidth = out.m_writeBandwidth;

AnKi/Core/App.h

@@ -22,7 +22,6 @@ class ResourceFilesystem;
 class UiManager;
 class UiQueueElement;
 class RenderQueue;
-class MaliHwCounters;
 
 /// The core class of the engine.
 class App
@@ -99,7 +98,6 @@ private:
 
 	// Sybsystems
 	GrManager* m_gr = nullptr;
-	MaliHwCounters* m_maliHwCounters = nullptr;
 	ResourceFilesystem* m_resourceFs = nullptr;
 	ResourceManager* m_resources = nullptr;
 	UiManager* m_ui = nullptr;

AnKi/Core/MaliHwCounters.cpp

@@ -13,16 +13,14 @@
 
 namespace anki {
 
-MaliHwCounters::MaliHwCounters(BaseMemoryPool* pool)
-	: m_pool(pool)
+MaliHwCounters::MaliHwCounters()
 {
-	ANKI_ASSERT(pool);
 #if ANKI_HWCPIPE_ENABLE
 	const hwcpipe::CpuCounterSet cpuCounters;
 	const hwcpipe::GpuCounterSet gpuCounters = {hwcpipe::GpuCounter::GpuCycles,
 												hwcpipe::GpuCounter::ExternalMemoryWriteBytes,
 												hwcpipe::GpuCounter::ExternalMemoryReadBytes};
-	hwcpipe::HWCPipe* hwc = newInstance<hwcpipe::HWCPipe>(*m_pool, cpuCounters, gpuCounters);
+	hwcpipe::HWCPipe* hwc = newInstance<hwcpipe::HWCPipe>(CoreMemoryPool::getSingleton(), cpuCounters, gpuCounters);
 
 	hwc->run();
 
@@ -37,7 +35,7 @@ MaliHwCounters::~MaliHwCounters()
 #if ANKI_HWCPIPE_ENABLE
 	hwcpipe::HWCPipe* hwc = static_cast<hwcpipe::HWCPipe*>(m_impl);
 	hwc->stop();
-	deleteInstance(*m_pool, hwc);
+	deleteInstance(CoreMemoryPool::getSingleton(), hwc);
 	m_impl = nullptr;
 #endif
 }

AnKi/Core/MaliHwCounters.h

@@ -24,22 +24,24 @@ public:
 };
 
 /// Sample HW counters for Mali GPUs.
-class MaliHwCounters
+class MaliHwCounters : public MakeSingleton<MaliHwCounters>
 {
-public:
-	MaliHwCounters(BaseMemoryPool* pool);
+	template<typename>
+	friend class MakeSingleton;
 
+public:
 	MaliHwCounters(const MaliHwCounters&) = delete; // Non-copyable
 
-	~MaliHwCounters();
-
 	MaliHwCounters& operator=(const MaliHwCounters&) = delete; // Non-copyable
 
 	void sample(MaliHwCountersOut& out);
 
 private:
-	BaseMemoryPool* m_pool = nullptr;
 	void* m_impl = nullptr;
+
+	MaliHwCounters();
+
+	~MaliHwCounters();
 };
 /// @}