From f2391e25ea8162562a6b355a9df8473193be88c3 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Thu, 4 Sep 2014 15:53:18 -0700
Subject: =?UTF-8?q?TextShader=20=E2=87=A2=20SDFShader?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/mbgl/renderer/painter.hpp       | 4 ++--
 include/mbgl/renderer/symbol_bucket.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/mbgl/renderer')

diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp
index 7a245a58da..af50a6b52a 100644
--- a/include/mbgl/renderer/painter.hpp
+++ b/include/mbgl/renderer/painter.hpp
@@ -17,7 +17,7 @@
 #include <mbgl/shader/linepattern_shader.hpp>
 #include <mbgl/shader/icon_shader.hpp>
 #include <mbgl/shader/raster_shader.hpp>
-#include <mbgl/shader/text_shader.hpp>
+#include <mbgl/shader/sdf_shader.hpp>
 #include <mbgl/shader/dot_shader.hpp>
 #include <mbgl/shader/gaussian_shader.hpp>
 
@@ -176,7 +176,7 @@ public:
     std::unique_ptr<PatternShader> patternShader;
     std::unique_ptr<IconShader> iconShader;
     std::unique_ptr<RasterShader> rasterShader;
-    std::unique_ptr<TextShader> textShader;
+    std::unique_ptr<SDFShader> sdfShader;
     std::unique_ptr<DotShader> dotShader;
     std::unique_ptr<GaussianShader> gaussianShader;
 
diff --git a/include/mbgl/renderer/symbol_bucket.hpp b/include/mbgl/renderer/symbol_bucket.hpp
index fb1678fc8b..23de5e6e5a 100644
--- a/include/mbgl/renderer/symbol_bucket.hpp
+++ b/include/mbgl/renderer/symbol_bucket.hpp
@@ -18,7 +18,7 @@
 namespace mbgl {
 
 class Style;
-class TextShader;
+class SDFShader;
 class IconShader;
 class DotShader;
 class Collision;
@@ -68,7 +68,7 @@ public:
     void addGlyphs(const PlacedGlyphs &glyphs, float placementZoom, PlacementRange placementRange,
                    float zoom);
 
-    void drawGlyphs(TextShader &shader);
+    void drawGlyphs(SDFShader &shader);
     void drawIcons(IconShader& shader);
 
 private:
-- 
cgit v1.2.1