From 16aa07c81ab2e83b1ad181d6fb19ee1d76d7e3f5 Mon Sep 17 00:00:00 2001 From: ExMix Date: Wed, 13 Nov 2013 11:10:23 +0300 Subject: [PATCH] [drape] VertexArrayBuffer will build on FrontendThread and can't be rebuiled, so IncompleteBucket can't be used --- drape/batcher.cpp | 6 ------ drape/batcher.hpp | 3 --- drape_head/glwidget.cpp | 2 -- 3 files changed, 11 deletions(-) diff --git a/drape/batcher.cpp b/drape/batcher.cpp index e1a182d94d..60795e0b16 100644 --- a/drape/batcher.cpp +++ b/drape/batcher.cpp @@ -167,12 +167,6 @@ void Batcher::InsertTriangleFan(const GLState & state, ReferencePoinerUseIncompleteBucket(it->first, it->second.GetWeakPointer()); -} - ReferencePoiner Batcher::GetBuffer(const GLState & state) { buckets_t::iterator it = m_buckets.find(state); diff --git a/drape/batcher.hpp b/drape/batcher.hpp index 16479c46cd..05f7abcd09 100644 --- a/drape/batcher.hpp +++ b/drape/batcher.hpp @@ -12,7 +12,6 @@ public: virtual ~IBatchFlush() {} virtual void FlushFullBucket(const GLState & state, OwnedPointer backet) = 0; - virtual void UseIncompleteBucket(const GLState & state, ReferencePoiner backet) = 0; }; class Batcher @@ -25,8 +24,6 @@ public: void InsertTriangleStrip(const GLState & state, ReferencePoiner params); void InsertTriangleFan(const GLState & state, ReferencePoiner params); - void RequestIncompleteBuckets(); - private: template void InsertTriangles(const GLState & state, strategy s, ReferencePoiner params); diff --git a/drape_head/glwidget.cpp b/drape_head/glwidget.cpp index 3de56dbfd9..9c46042bce 100644 --- a/drape_head/glwidget.cpp +++ b/drape_head/glwidget.cpp @@ -78,8 +78,6 @@ void GLWidget::paintGL() } } } - else - m_batcher->RequestIncompleteBuckets(); } void GLWidget::renderBucket(const GLState & state, ReferencePoiner bucket)