From 328fd56bdb2f7d44b89d2b1ac610f85bdec92b0f Mon Sep 17 00:00:00 2001 From: rachytski Date: Fri, 30 Dec 2011 23:36:50 +0400 Subject: [PATCH] fixed guiThreadStorage pool starvation. --- android/jni/com/mapswithme/maps/Framework.cpp | 2 +- map/tiling_render_policy_st.cpp | 6 ++++-- platform/platform_qt.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index 25fec20818..f6fc255fc0 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -89,7 +89,7 @@ namespace android LOG(LDEBUG, ("AF::InitRenderer 1")); yg::ResourceManager::Params rmParams; - rmParams.m_videoMemoryLimit = 20 * 1024 * 1024; + rmParams.m_videoMemoryLimit = 100 * 1024 * 1024; rmParams.m_rtFormat = yg::Data8Bpp; rmParams.m_texFormat = yg::Data4Bpp; diff --git a/map/tiling_render_policy_st.cpp b/map/tiling_render_policy_st.cpp index 08a0fed880..87f760d386 100644 --- a/map/tiling_render_policy_st.cpp +++ b/map/tiling_render_policy_st.cpp @@ -82,7 +82,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(VideoTimer * videoTimer, sizeof(yg::gl::Vertex), 600 * sizeof(unsigned short), sizeof(unsigned short), - 20, + 200, true, true, 1, @@ -205,7 +205,7 @@ void TilingRenderPolicyST::SetRenderFn(TRenderFn renderFn) void TilingRenderPolicyST::BeginFrame(shared_ptr const & e, ScreenBase const & s) { - m_IsDebugging = true; + m_IsDebugging = false; if (m_IsDebugging) LOG(LINFO, ("-------BeginFrame-------")); } @@ -227,6 +227,8 @@ bool TilingRenderPolicyST::NeedRedraw() const void TilingRenderPolicyST::DrawFrame(shared_ptr const & e, ScreenBase const & currentScreen) { + m_resourceManager->mergeFreeResources(); + RenderQueuedCommands(e->drawer()->screen().get()); m_resourceManager->mergeFreeResources(); diff --git a/platform/platform_qt.cpp b/platform/platform_qt.cpp index cf5ec949b7..8f609eb257 100644 --- a/platform/platform_qt.cpp +++ b/platform/platform_qt.cpp @@ -71,7 +71,7 @@ void Platform::GetFontNames(FilesList & res) const int Platform::MaxTilesCount() const { - return 120; + return 30; } int Platform::TileSize() const