From 0045eef00a17b680ba8d92eda5a8baf31cdde7cc Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Tue, 20 Oct 2015 12:11:58 -0700
Subject: [PATCH] [core] Moved Painter::setup() to Painter ctor

---
 src/mbgl/map/map_context.cpp  | 6 +-----
 src/mbgl/renderer/painter.cpp | 1 +
 src/mbgl/renderer/painter.hpp | 3 +--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/mbgl/map/map_context.cpp b/src/mbgl/map/map_context.cpp
index 7b44222a7..3359cff2d 100644
--- a/src/mbgl/map/map_context.cpp
+++ b/src/mbgl/map/map_context.cpp
@@ -243,11 +243,7 @@ bool MapContext::renderSync(const TransformState& state, const FrameData& frame)
     // Cleanup OpenGL objects that we abandoned since the last render call.
     glObjectStore.performCleanup();
 
-    if (!painter) {
-        painter = std::make_unique<Painter>(data);
-        painter->setup();
-    }
-
+    if (!painter) painter = std::make_unique<Painter>(data);
     painter->render(*style, transformState, frame, data.getAnimationTime());
 
     if (data.mode == MapMode::Still) {
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
index cd7544743..ad01644cf 100644
--- a/src/mbgl/renderer/painter.cpp
+++ b/src/mbgl/renderer/painter.cpp
@@ -43,6 +43,7 @@
 using namespace mbgl;
 
 Painter::Painter(MapData& data_) : data(data_) {
+    setup();
 }
 
 Painter::~Painter() {
diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
index 7f6fccd58..8d828602e 100644
--- a/src/mbgl/renderer/painter.hpp
+++ b/src/mbgl/renderer/painter.hpp
@@ -79,8 +79,6 @@ public:
     Painter(MapData& data);
     ~Painter();
 
-    void setup();
-
     // Renders the backdrop of the OpenGL view. This also paints in areas where we don't have any
     // tiles whatsoever.
     void clear();
@@ -132,6 +130,7 @@ public:
     bool needsAnimation() const;
 
 private:
+    void setup();
     void setupShaders();
     mat4 translatedMatrix(const mat4& matrix, const std::array<float, 2> &translation, const TileID &id, TranslateAnchorType anchor);