map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

allocating renderTargets in TilingRenderPolicyXXX only

Browse source
This commit is contained in:
rachytski 2011-08-31 13:32:01 +03:00 • committed by Alex Zolotarev
parent 586f370c75
commit c41ac36440
9 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
iphone/Maps/Classes/EAGLView.mm
View file

@ -97,9 +97,6 @@
blitVBSize, blitIBSize, 15 * GetPlatform().CpuCores(),
512, 256, 10 * GetPlatform().CpuCores(),
512, 256, 10 * GetPlatform().CpuCores(),
GetPlatform().TileSize(),
GetPlatform().TileSize(),
GetPlatform().MaxTilesCount(),
"unicode_blocks.txt",
"fonts_whitelist.txt",
"fonts_blacklist.txt",

4
map/tiling_render_policy_mt.cpp
View file

@ -27,12 +27,16 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(shared_ptr<WindowHandle> const & wind
&m_tileRenderer,
windowHandle)
{
}
void TilingRenderPolicyMT::Initialize(shared_ptr<yg::gl::RenderContext> const & primaryContext,
shared_ptr<yg::ResourceManager> const & resourceManager)
{
RenderPolicy::Initialize(primaryContext, resourceManager);
resourceManager->initRenderTargets(GetPlatform().TileSize(), GetPlatform().TileSize(), GetPlatform().MaxTilesCount());
m_tileRenderer.Initialize(primaryContext, resourceManager, GetPlatform().VisualScale());
m_coverageGenerator.Initialize();
}

2
map/tiling_render_policy_st.cpp
View file

@ -26,6 +26,8 @@ void TilingRenderPolicyST::Initialize(shared_ptr<yg::gl::RenderContext> const &
{
RenderPolicy::Initialize(primaryContext, rm);
rm->initRenderTargets(GetPlatform().TileSize(), GetPlatform().TileSize(), GetPlatform().MaxTilesCount());
/// render single tile on the same thread
shared_ptr<yg::gl::FrameBuffer> frameBuffer(new yg::gl::FrameBuffer());

1
qt/widgets.cpp
View file

@ -52,7 +52,6 @@ namespace qt
10,
512, 256,
5,
GetPlatform().TileSize(), GetPlatform().TileSize(), GetPlatform().MaxTilesCount(),
"unicode_blocks.txt",
"fonts_whitelist.txt",
"fonts_blacklist.txt",

1
qt_tstfrm/tstwidgets.cpp
View file

@ -56,7 +56,6 @@ void GLDrawWidget::initializeGL()
30,
512, 256, 10,
512, 256, 5,
GetPlatform().TileSize(), GetPlatform().TileSize(), GetPlatform().MaxTilesCount(),
"unicode_blocks.txt",
"fonts_whitelist.txt",
"fonts_blacklist.txt",

22
yg/resource_manager.cpp
View file

@ -24,7 +24,6 @@ namespace yg
size_t blitVBSize, size_t blitIBSize, size_t blitStoragesCount,
size_t dynamicTexWidth, size_t dynamicTexHeight, size_t dynamicTexCount,
size_t fontTexWidth, size_t fontTexHeight, size_t fontTexCount,
size_t tileTexWidth, size_t tileTexHeight, size_t tileTexCount,
char const * blocksFile, char const * whiteListFile, char const * blackListFile,
size_t glyphCacheSize,
size_t glyphCacheCount,
@ -32,7 +31,6 @@ namespace yg
bool useVA)
: m_dynamicTextureWidth(dynamicTexWidth), m_dynamicTextureHeight(dynamicTexHeight),
m_fontTextureWidth(fontTexWidth), m_fontTextureHeight(fontTexHeight),
m_tileTextureWidth(tileTexWidth), m_tileTextureHeight(tileTexHeight),
m_vbSize(vbSize), m_ibSize(ibSize),
m_smallVBSize(smallVBSize), m_smallIBSize(smallIBSize),
m_blitVBSize(blitVBSize), m_blitIBSize(blitIBSize),
@ -66,7 +64,7 @@ namespace yg
m_dynamicTextures.PushBack(t);
}
LOG(LINFO, ("allocating ", dynamicTexWidth * dynamicTexHeight * sizeof(TDynamicTexture::pixel_t), " bytes for textures"));
LOG(LINFO, ("allocating ", dynamicTexCount * dynamicTexWidth * dynamicTexHeight * sizeof(TDynamicTexture::pixel_t), " bytes for textures"));
for (size_t i = 0; i < fontTexCount; ++i)
{
@ -74,15 +72,21 @@ namespace yg
m_fontTextures.PushBack(t);
}
LOG(LINFO, ("allocating ", fontTexWidth * fontTexHeight * sizeof(TDynamicTexture::pixel_t), " bytes for font textures"));
LOG(LINFO, ("allocating ", fontTexCount * fontTexWidth * fontTexHeight * sizeof(TDynamicTexture::pixel_t), " bytes for font textures"));
}
for (size_t i = 0; i < tileTexCount; ++i)
void ResourceManager::initRenderTargets(size_t renderTargetWidth, size_t renderTargetHeight, size_t renderTargetsCount)
{
m_renderTargetWidth = renderTargetWidth;
m_renderTargetHeight = renderTargetHeight;
for (size_t i = 0; i < renderTargetsCount; ++i)
{
shared_ptr<gl::BaseTexture> t(new TStaticTexture(tileTexWidth, tileTexHeight));
shared_ptr<gl::BaseTexture> t(new TStaticTexture(renderTargetWidth, renderTargetHeight));
m_renderTargets.PushBack(t);
}
LOG(LINFO, ("allocating ", tileTexWidth * tileTexHeight * sizeof(TStaticTexture::pixel_t), " bytes for tiles"));
LOG(LINFO, ("allocating ", renderTargetsCount * renderTargetWidth * renderTargetHeight * sizeof(TStaticTexture::pixel_t), " bytes for render targets"));
}
shared_ptr<gl::BaseTexture> const & ResourceManager::getTexture(string const & fileName)
@ -144,12 +148,12 @@ namespace yg
size_t ResourceManager::tileTextureWidth() const
{
return m_tileTextureWidth;
return m_renderTargetWidth;
}
size_t ResourceManager::tileTextureHeight() const
{
return m_tileTextureHeight;
return m_renderTargetHeight;
}
GlyphCache * ResourceManager::glyphCache(int glyphCacheID)

7
yg/resource_manager.hpp
View file

@ -49,8 +49,8 @@ namespace yg
ThreadedList<shared_ptr<gl::BaseTexture> > m_fontTextures;
size_t m_tileTextureWidth;
size_t m_tileTextureHeight;
size_t m_renderTargetWidth;
size_t m_renderTargetHeight;
ThreadedList<shared_ptr<gl::BaseTexture> > m_renderTargets;
@ -86,13 +86,14 @@ namespace yg
size_t blitVBSize, size_t blitIBSize, size_t blitStoragesCount,
size_t texWidth, size_t texHeight, size_t texCount,
size_t fontTexWidth, size_t fontTexHeight, size_t fontTexCount,
size_t tileTexWidth, size_t tileTexHeight, size_t tileTexCount,
char const * blocksFile, char const * whileListFile, char const * blackListFile,
size_t glyphCacheSize,
size_t glyphCacheCount,
RtFormat fmt,
bool useVA);
void initRenderTargets(size_t renderTargetWidth, size_t renderTargetHeight, size_t renderTargetCount);
shared_ptr<gl::BaseTexture> const & getTexture(string const & fileName);
ThreadedList<gl::Storage> & storages();

2
yg/yg_tests/skin_loader_test.cpp
View file

@ -8,6 +8,6 @@
UNIT_TEST(SkinLoaderTest_Main)
{
GL_TEST_START;
shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(1000, 1000, 2, 1000, 1000, 2, 1000, 1000, 2, 128, 128, 15, 256, 256, 5, 256, 256, 40, "unicode_blocks.txt", "fonts_whitelist.txt", "fonts_blacklist.txt", 2 * 1024 * 1024, 3, yg::Rt8Bpp, false));
shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(1000, 1000, 2, 1000, 1000, 2, 1000, 1000, 2, 128, 128, 15, 256, 256, 5, "unicode_blocks.txt", "fonts_whitelist.txt", "fonts_blacklist.txt", 2 * 1024 * 1024, 3, yg::Rt8Bpp, false));
loadSkin(rm, "basic.skn", 2, 2);
};

2
yg/yg_tests/skin_test.cpp
View file

@ -10,7 +10,7 @@ UNIT_TEST(SkinTest_Main)
{
GL_TEST_START;
shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(100, 100, 1, 100, 100, 1, 100, 100, 1, 128, 128, 15, 256, 256, 5, 256, 256, 40, "unicode_blocks.txt", "fonts_whitelist.txt", "fonts_blacklist.txt", 2 * 1024 * 1024, 3, yg::Rt8Bpp, false));
shared_ptr<yg::ResourceManager> rm(new yg::ResourceManager(100, 100, 1, 100, 100, 1, 100, 100, 1, 128, 128, 15, 256, 256, 5, "unicode_blocks.txt", "fonts_whitelist.txt", "fonts_blacklist.txt", 2 * 1024 * 1024, 3, yg::Rt8Bpp, false));
yg::Skin * skin = loadSkin(rm, "basic.skn", 2, 2);
double p0 [] = {1, 1};