From 1f50787b057ea3fef8c5f0b3a3945286ce07ea6a Mon Sep 17 00:00:00 2001 From: vng Date: Fri, 15 May 2015 13:09:27 +0300 Subject: Render policies refactoring to support GPU and Software rendering. --- qt_tstfrm/tstwidgets.cpp | 10 ++++------ qt_tstfrm/tstwidgets.hpp | 4 +++- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'qt_tstfrm') diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp index b2672f149d..77a67cabf6 100644 --- a/qt_tstfrm/tstwidgets.cpp +++ b/qt_tstfrm/tstwidgets.cpp @@ -1,5 +1,7 @@ #include "qt_tstfrm/tstwidgets.hpp" +#include "map/render_policy.hpp" + #include "graphics/screen.hpp" #include "graphics/resource_manager.hpp" @@ -103,11 +105,7 @@ namespace tst rmp.m_textureParams[graphics::ESmallTexture] = tpp; - rmp.m_glyphCacheParams = graphics::ResourceManager::GlyphCacheParams("unicode_blocks.txt", - "fonts_whitelist.txt", - "fonts_blacklist.txt", - 2 * 1024 * 1024, - graphics::EDensityMDPI); + rmp.m_glyphCacheParams = GetResourceGlyphCacheParams(graphics::EDensityMDPI); rmp.m_threadSlotsCount = 1; rmp.m_renderThreadsCount = 0; @@ -123,7 +121,7 @@ namespace tst GetPlatform().GetFontNames(fonts); m_resourceManager->addFonts(fonts); - Drawer::Params params; + graphics::Screen::Params params; m_primaryFrameBuffer.reset(new graphics::gl::FrameBuffer(true)); diff --git a/qt_tstfrm/tstwidgets.hpp b/qt_tstfrm/tstwidgets.hpp index b7b60f0033..a02ab3fa47 100644 --- a/qt_tstfrm/tstwidgets.hpp +++ b/qt_tstfrm/tstwidgets.hpp @@ -2,10 +2,12 @@ #include "graphics/opengl/texture.hpp" #include "graphics/opengl/renderbuffer.hpp" +#include "graphics/opengl/framebuffer.hpp" + +#include "graphics/screen.hpp" #include "graphics/resource_manager.hpp" -#include "map/drawer.hpp" #include "map/qgl_render_context.hpp" #include "std/shared_ptr.hpp" -- cgit v1.2.3