Added circle shader as member of Painter class

Part of #1740.
mapbox · Jun 18, 2015 · 789f189 · 789f189
1 parent 743f1ed
commit 789f189
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp
@@ -26,6 +26,7 @@
 #include <mbgl/shader/dot_shader.hpp>
 #include <mbgl/shader/gaussian_shader.hpp>
 #include <mbgl/shader/box_shader.hpp>
+#include <mbgl/shader/circle_shader.hpp>
 
 #include <mbgl/util/constants.hpp>
 #include <mbgl/util/mat3.hpp>
@@ -66,6 +67,7 @@ void Painter::setup() {
     assert(sdfIconShader);
     assert(dotShader);
     assert(gaussianShader);
+    assert(circleShader);
 
 
     // Blending
@@ -101,6 +103,7 @@ void Painter::setupShaders() {
     if (!dotShader) dotShader = std::make_unique<DotShader>();
     if (!gaussianShader) gaussianShader = std::make_unique<GaussianShader>();
     if (!collisionBoxShader) collisionBoxShader = std::make_unique<CollisionBoxShader>();
+    if (!circleShader) circleShader = std::make_unique<CircleShader>();
 }
 
 void Painter::resize() {

diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp
@@ -48,6 +48,7 @@ class LineShader;
 class LinejoinShader;
 class LineSDFShader;
 class LinepatternShader;
+class CircleShader;
 class PatternShader;
 class IconShader;
 class RasterShader;
@@ -221,6 +222,7 @@ class Painter : private util::noncopyable {
     std::unique_ptr<DotShader> dotShader;
     std::unique_ptr<GaussianShader> gaussianShader;
     std::unique_ptr<CollisionBoxShader> collisionBoxShader;
+    std::unique_ptr<CircleShader> circleShader;
 
     StaticVertexBuffer backgroundBuffer = {
         { -1, -1 }, { 1, -1 },