From dedcdd220c9e27d15966ebc6dbe65aae67c40ddb Mon Sep 17 00:00:00 2001 From: rachytski Date: Thu, 12 Jan 2012 21:15:32 +0400 Subject: [PATCH] renamed mergeResources into updatePoolState for consistency. --- base/resource_pool.hpp | 15 +++++++------- map/queued_render_policy.cpp | 2 +- map/render_policy_mt.cpp | 2 +- yg/geometry_batcher.hpp | 4 ++-- yg/resource_manager.cpp | 32 +++++++++++++++--------------- yg/resource_manager.hpp | 38 +++++++++++++++++------------------- 6 files changed, 45 insertions(+), 48 deletions(-) diff --git a/base/resource_pool.hpp b/base/resource_pool.hpp index 7b0f615ca5..42f74cf41a 100644 --- a/base/resource_pool.hpp +++ b/base/resource_pool.hpp @@ -51,8 +51,7 @@ struct BasePoolTraits return m_pool.IsCancelled(); } - /// non-intuitive name, should refactor to more meaningfull - void Merge() + void UpdateState() { } }; @@ -87,7 +86,7 @@ struct SeparateFreePoolTraits : TBase } } - void MergeImpl(list & l) + void UpdateStateImpl(list & l) { for (typename list::const_iterator it = l.begin(); it != l.end(); @@ -103,9 +102,9 @@ struct SeparateFreePoolTraits : TBase l.clear(); } - void Merge() + void UpdateState() { - m_freePool.ProcessList(bind(&SeparateFreePoolTraits::MergeImpl, this, _1)); + m_freePool.ProcessList(bind(&SeparateFreePoolTraits::UpdateStateImpl, this, _1)); } }; @@ -189,7 +188,7 @@ public: virtual void EnterBackground() = 0; virtual void Cancel() = 0; virtual bool IsCancelled() const = 0; - virtual void Merge() = 0; + virtual void UpdateState() = 0; virtual void SetIsDebugging(bool flag) = 0; }; @@ -245,9 +244,9 @@ public: return m_traits->IsCancelled(); } - void Merge() + void UpdateState() { - m_traits->Merge(); + m_traits->UpdateState(); } void SetIsDebugging(bool isDebugging) diff --git a/map/queued_render_policy.cpp b/map/queued_render_policy.cpp index 06cc716748..3f5f453826 100644 --- a/map/queued_render_policy.cpp +++ b/map/queued_render_policy.cpp @@ -57,7 +57,7 @@ void QueuedRenderPolicy::DrawFrame(shared_ptr const & ev, ScreenBase for (unsigned i = 0; i < m_PipelinesCount; ++i) { RenderQueuedCommands(i, state); - m_resourceManager->mergeFreeResources(); + m_resourceManager->updatePoolState(); } } diff --git a/map/render_policy_mt.cpp b/map/render_policy_mt.cpp index 0efcd34387..1296fdf039 100644 --- a/map/render_policy_mt.cpp +++ b/map/render_policy_mt.cpp @@ -179,7 +179,7 @@ void RenderPolicyMT::EndFrame(shared_ptr const & e, void RenderPolicyMT::DrawFrame(shared_ptr const & e, ScreenBase const & s) { - m_resourceManager->mergeFreeResources(); + m_resourceManager->updatePoolState(); m_renderQueue->renderStatePtr()->m_doRepaintAll = DoForceUpdate(); diff --git a/yg/geometry_batcher.hpp b/yg/geometry_batcher.hpp index 57bc8d999f..e16baa90ec 100644 --- a/yg/geometry_batcher.hpp +++ b/yg/geometry_batcher.hpp @@ -86,7 +86,7 @@ namespace yg struct FreeStorage : public Command { - ResourceManager::TStoragePool * m_storagePool; + TStoragePool * m_storagePool; Storage m_storage; void perform(); @@ -95,7 +95,7 @@ namespace yg struct FreeTexture : public Command { - ResourceManager::TTexturePool * m_texturePool; + TTexturePool * m_texturePool; shared_ptr m_texture; void perform(); diff --git a/yg/resource_manager.cpp b/yg/resource_manager.cpp index 19f310b854..d0b226aadb 100644 --- a/yg/resource_manager.cpp +++ b/yg/resource_manager.cpp @@ -666,68 +666,68 @@ namespace yg return 1 + m_params.m_glyphCacheParams.m_renderThreadCount; } - ResourceManager::TStoragePool * ResourceManager::primaryStorages() + TStoragePool * ResourceManager::primaryStorages() { return m_primaryStorages.get(); } - ResourceManager::TStoragePool * ResourceManager::smallStorages() + TStoragePool * ResourceManager::smallStorages() { return m_smallStorages.get(); } - ResourceManager::TStoragePool * ResourceManager::guiThreadStorages() + TStoragePool * ResourceManager::guiThreadStorages() { return m_guiThreadStorages.get(); } - ResourceManager::TStoragePool * ResourceManager::blitStorages() + TStoragePool * ResourceManager::blitStorages() { return m_blitStorages.get(); } - ResourceManager::TStoragePool * ResourceManager::multiBlitStorages() + TStoragePool * ResourceManager::multiBlitStorages() { return m_multiBlitStorages.get(); } - ResourceManager::TTexturePool * ResourceManager::primaryTextures() + TTexturePool * ResourceManager::primaryTextures() { return m_primaryTextures.get(); } - ResourceManager::TTexturePool * ResourceManager::fontTextures() + TTexturePool * ResourceManager::fontTextures() { return m_fontTextures.get(); } - ResourceManager::TTexturePool * ResourceManager::renderTargetTextures() + TTexturePool * ResourceManager::renderTargetTextures() { return m_renderTargets.get(); } - ResourceManager::TTexturePool * ResourceManager::styleCacheTextures() + TTexturePool * ResourceManager::styleCacheTextures() { return m_styleCacheTextures.get(); } - ResourceManager::TTexturePool * ResourceManager::guiThreadTextures() + TTexturePool * ResourceManager::guiThreadTextures() { return m_guiThreadTextures.get(); } - void ResourceManager::mergeFreeResources() + void ResourceManager::updatePoolState() { if (m_guiThreadStorages.get()) - m_guiThreadStorages->Merge(); + m_guiThreadStorages->UpdateState(); if (m_primaryStorages.get()) - m_primaryStorages->Merge(); + m_primaryStorages->UpdateState(); if (m_smallStorages.get()) - m_smallStorages->Merge(); + m_smallStorages->UpdateState(); if (m_blitStorages.get()) - m_blitStorages->Merge(); + m_blitStorages->UpdateState(); if (m_multiBlitStorages.get()) - m_multiBlitStorages->Merge(); + m_multiBlitStorages->UpdateState(); } void ResourceManager::cancel() diff --git a/yg/resource_manager.hpp b/yg/resource_manager.hpp index 1ca5bef1bf..017cd075d6 100644 --- a/yg/resource_manager.hpp +++ b/yg/resource_manager.hpp @@ -50,27 +50,25 @@ namespace yg void BeforeMerge(gl::Storage const & e); }; + typedef BasePoolTraits, TTextureFactory> TBaseTexturePoolTraits; + typedef FixedSizePoolTraits TTexturePoolTraits; + typedef ResourcePoolImpl TTexturePoolImpl; + + typedef ResourcePool > TTexturePool; + + typedef BasePoolTraits TBaseStoragePoolTraits; + typedef SeparateFreePoolTraits TSeparateFreeStoragePoolTraits; + + typedef FixedSizePoolTraits TMergeableStoragePoolTraits; + typedef ResourcePoolImpl TMergeableStoragePoolImpl; + + typedef FixedSizePoolTraits TNonMergeableStoragePoolTraits; + typedef ResourcePoolImpl TNonMergeableStoragePoolImpl; + + typedef ResourcePool TStoragePool; + class ResourceManager { - public: - - typedef BasePoolTraits, TTextureFactory> TBaseTexturePoolTraits; - typedef FixedSizePoolTraits TTexturePoolTraits; - typedef ResourcePoolImpl TTexturePoolImpl; - - typedef ResourcePool > TTexturePool; - - typedef BasePoolTraits TBaseStoragePoolTraits; - typedef SeparateFreePoolTraits TSeparateFreeStoragePoolTraits; - - typedef FixedSizePoolTraits TMergeableStoragePoolTraits; - typedef ResourcePoolImpl TMergeableStoragePoolImpl; - - typedef FixedSizePoolTraits TNonMergeableStoragePoolTraits; - typedef ResourcePoolImpl TNonMergeableStoragePoolImpl; - - typedef ResourcePool TStoragePool; - public: struct StoragePoolParams @@ -267,7 +265,7 @@ namespace yg void enterBackground(); void enterForeground(); - void mergeFreeResources(); + void updatePoolState(); void cancel();