diff --git a/map/coverage_generator.cpp b/map/coverage_generator.cpp index dca805ca6c..7ddc244be0 100644 --- a/map/coverage_generator.cpp +++ b/map/coverage_generator.cpp @@ -44,15 +44,15 @@ CoverageGenerator::CoverageGenerator( rm->cacheThreadGlyphCacheID(), glQueue)); - m_cacheParams.m_resourceManager = m_resourceManager; - m_cacheParams.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer()); + m_params.m_resourceManager = m_resourceManager; + m_params.m_frameBuffer = make_shared_ptr(new yg::gl::FrameBuffer()); if (glQueue) - m_cacheParams.m_renderQueue = glQueue; + m_params.m_renderQueue = glQueue; - m_cacheParams.m_doUnbindRT = false; - m_cacheParams.m_isSynchronized = false; - m_cacheParams.m_glyphCacheID = m_resourceManager->cacheThreadGlyphCacheID(); + m_params.m_doUnbindRT = false; + m_params.m_isSynchronized = false; + m_params.m_glyphCacheID = m_resourceManager->cacheThreadGlyphCacheID(); m_cacheSkin.reset(loadSkin(m_resourceManager, skinName, @@ -70,7 +70,7 @@ void CoverageGenerator::InitializeThreadGL() if (m_renderContext) m_renderContext->makeCurrent(); - m_cacheScreen.reset(new yg::gl::Screen(m_cacheParams)); + m_cacheScreen.reset(new yg::gl::Screen(m_params)); m_cacheScreen->setSkin(m_cacheSkin); } diff --git a/yg/skin_page.cpp b/yg/skin_page.cpp index eb7d76c1af..ea7b79b3a6 100644 --- a/yg/skin_page.cpp +++ b/yg/skin_page.cpp @@ -348,6 +348,9 @@ namespace yg return; } + if (isDebugging()) + LOG(LINFO, ("uploading to", m_texture->id(), "texture")); + static_cast(m_texture.get())->lock(); TDynamicTexture * dynTexture = static_cast(m_texture.get()); @@ -428,29 +431,6 @@ namespace yg m_texture.reset(); } - void SkinPage::freeTexture() - { - if (m_texture) - { - switch (m_type) - { - case EPrimary: - m_resourceManager->primaryTextures()->Free(m_texture); - break; - case EFonts: - m_resourceManager->fontTextures()->Free(m_texture); - break; - case ELightWeight: - m_resourceManager->guiThreadTextures()->Free(m_texture); - break; - default: - LOG(LINFO, ("freeTexture call for with invalid type param")); - } - - m_texture.reset(); - } - } - void SkinPage::reserveTexture() const { switch (m_type) diff --git a/yg/skin_page.hpp b/yg/skin_page.hpp index 7ff571a877..d8a480f696 100644 --- a/yg/skin_page.hpp +++ b/yg/skin_page.hpp @@ -142,7 +142,6 @@ namespace yg uint8_t pipelineID); void reserveTexture() const; - void freeTexture(); void resetTexture(); void createPacker();