From 89a346633b6d84c6149625e6b97158c31e7cb8f3 Mon Sep 17 00:00:00 2001
From: rachytski <siarhei.rachytski@gmail.com>
Date: Sat, 31 Dec 2011 11:24:44 +0400
Subject: [PATCH] removed some dead code from geometry_batcher and
 geometry_renderer

---
 map/tile_renderer.cpp    |  2 +-
 yg/geometry_batcher.cpp  | 11 +----------
 yg/geometry_batcher.hpp  |  2 --
 yg/geometry_renderer.cpp | 10 ----------
 yg/geometry_renderer.hpp |  3 ---
 yg/packets_queue.cpp     |  5 +++++
 yg/packets_queue.hpp     |  4 ++++
 yg/styles_cache.cpp      |  5 +++--
 8 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/map/tile_renderer.cpp b/map/tile_renderer.cpp
index 9814a01175..263b621735 100644
--- a/map/tile_renderer.cpp
+++ b/map/tile_renderer.cpp
@@ -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();
 
diff --git a/yg/geometry_batcher.cpp b/yg/geometry_batcher.cpp
index 1140a41c08..cd079601fc 100644
--- a/yg/geometry_batcher.cpp
+++ b/yg/geometry_batcher.cpp
@@ -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);
 
diff --git a/yg/geometry_batcher.hpp b/yg/geometry_batcher.hpp
index ceb7f3178d..2f8d38339c 100644
--- a/yg/geometry_batcher.hpp
+++ b/yg/geometry_batcher.hpp
@@ -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);
diff --git a/yg/geometry_renderer.cpp b/yg/geometry_renderer.cpp
index fa3421350e..89490ea771 100644
--- a/yg/geometry_renderer.cpp
+++ b/yg/geometry_renderer.cpp
@@ -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())
diff --git a/yg/geometry_renderer.hpp b/yg/geometry_renderer.hpp
index 7fe17aa287..5bf6460c9d 100644
--- a/yg/geometry_renderer.hpp
+++ b/yg/geometry_renderer.hpp
@@ -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,
diff --git a/yg/packets_queue.cpp b/yg/packets_queue.cpp
index 4198fc61a3..0081796dee 100644
--- a/yg/packets_queue.cpp
+++ b/yg/packets_queue.cpp
@@ -87,5 +87,10 @@ namespace yg
     {
       m_fenceManager.joinFence(id);
     }
+
+    void PacketsQueue::completeCommands()
+    {
+      joinFence(insertFence());
+    }
   }
 }
diff --git a/yg/packets_queue.hpp b/yg/packets_queue.hpp
index dc34d3b82c..9d687e8411 100644
--- a/yg/packets_queue.hpp
+++ b/yg/packets_queue.hpp
@@ -68,6 +68,10 @@ namespace yg
       void markFrameBoundary();
       int  insertFence();
       void joinFence(int id);
+
+      /// Convenience functions
+
+      void completeCommands();
     };
   }
 }
diff --git a/yg/styles_cache.cpp b/yg/styles_cache.cpp
index 5f12cd684a..91fe3c4830 100644
--- a/yg/styles_cache.cpp
+++ b/yg/styles_cache.cpp
@@ -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());
   }