pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

removed some dead code from geometry_batcher and geometry_renderer

Browse source
This commit is contained in:
rachytski 2011-12-31 11:24:44 +04:00 • committed by Alex Zolotarev
parent 328fd56bdb
commit 89a346633b
8 changed files with 14 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
map/tile_renderer.cpp
View file

@ -174,7 +174,7 @@ void TileRenderer::DrawTile(core::CommandsQueue::Environment const & env,
yg::gl::PacketsQueue * glQueue = threadData.m_drawerParams.m_renderQueue;
if (glQueue)
glQueue->joinFence(glQueue->insertFence());
glQueue->completeCommands();
double duration = timer.ElapsedSeconds();

11
yg/geometry_batcher.cpp
View file

@ -363,15 +363,6 @@ namespace yg
m_skin->getPage(pipelineID)->freeTexture();*/
}
void GeometryBatcher::uploadData(shared_ptr<SkinPage> const & skinPage)
{
if (skinPage->hasData())
{
base_t::uploadData(skinPage->uploadQueue(), skinPage->texture());
skinPage->clearUploadQueue();
}
}
void GeometryBatcher::UnlockStorage::perform()
{
if (isDebugging())
@ -418,7 +409,7 @@ namespace yg
GeometryPipeline & pipeline = m_pipelines[pipelineID];
if (pipeline.m_currentIndex)
{
uploadData(skinPage);
skinPage->uploadData(renderQueue());
unlockPipeline(pipelineID);

2
yg/geometry_batcher.hpp
View file

@ -138,8 +138,6 @@ namespace yg
void beginFrame();
void endFrame();
void uploadData(shared_ptr<SkinPage> const & skinPage);
void flushPipeline(shared_ptr<SkinPage> const & skinPage, int pipelineID);
void unlockPipeline(int pipelineID);
void discardPipeline(int pipelineID);

10
yg/geometry_renderer.cpp
View file

@ -83,16 +83,6 @@ namespace yg
static_cast<gl::ManagedTexture*>(m_texture.get())->unlock();
}
void GeometryRenderer::uploadData(vector<shared_ptr<ResourceStyle> > const & v,
shared_ptr<BaseTexture> const & texture)
{
shared_ptr<UploadData> uploadData(new UploadData());
uploadData->m_styles = v;
uploadData->m_texture = texture;
processCommand(uploadData);
}
void GeometryRenderer::applyStates(bool isAntiAliased)
{
if (renderQueue())

3
yg/geometry_renderer.hpp
View file

@ -41,9 +41,6 @@ namespace yg
GeometryRenderer(base_t::Params const & params);
void uploadData(vector<shared_ptr<ResourceStyle> > const & v,
shared_ptr<BaseTexture> const & texture);
void applyStates(bool isAntiAliased);
void drawGeometry(shared_ptr<BaseTexture> const & texture,

5
yg/packets_queue.cpp
View file

@ -87,5 +87,10 @@ namespace yg
{
m_fenceManager.joinFence(id);
}
void PacketsQueue::completeCommands()
{
joinFence(insertFence());
}
}
}

4
yg/packets_queue.hpp
View file

@ -68,6 +68,10 @@ namespace yg
void markFrameBoundary();
int insertFence();
void joinFence(int id);
/// Convenience functions
void completeCommands();
};
}
}

5
yg/styles_cache.cpp
View file

@ -54,11 +54,12 @@ namespace yg
{
m_cachePage->uploadData(m_glQueue);
m_glQueue->PushBack(yg::gl::Packet(make_shared_ptr(new yg::gl::Renderer::FinishCommand()), false));
if (m_glQueue)
m_glQueue->PushBack(yg::gl::Packet(make_shared_ptr(new yg::gl::Renderer::FinishCommand()), false));
/// waiting for upload to complete
if (m_glQueue)
m_glQueue->joinFence(m_glQueue->insertFence());
m_glQueue->completeCommands();
else
OGLCHECK(glFinish());
}