diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 963639a7f..51c85b39b 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -27,7 +27,6 @@ #include #include #include -#include #include #include @@ -64,7 +63,6 @@ Painter::Painter(const TransformState& state_, gl::GLObjectStore& glObjectStore_ rasterShader = std::make_unique(glObjectStore); sdfGlyphShader = std::make_unique(glObjectStore); sdfIconShader = std::make_unique(glObjectStore); - dotShader = std::make_unique(glObjectStore); collisionBoxShader = std::make_unique(glObjectStore); circleShader = std::make_unique(glObjectStore); diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index ee069b0a4..a5d4a25b6 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -65,7 +65,6 @@ class IconShader; class RasterShader; class SDFGlyphShader; class SDFIconShader; -class DotShader; class CollisionBoxShader; struct ClipID; @@ -206,7 +205,6 @@ private: std::unique_ptr rasterShader; std::unique_ptr sdfGlyphShader; std::unique_ptr sdfIconShader; - std::unique_ptr dotShader; std::unique_ptr collisionBoxShader; std::unique_ptr circleShader; diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp index 520989ac3..a826ff061 100644 --- a/src/mbgl/renderer/symbol_bucket.hpp +++ b/src/mbgl/renderer/symbol_bucket.hpp @@ -25,7 +25,6 @@ namespace mbgl { class SDFShader; class IconShader; class CollisionBoxShader; -class DotShader; class CollisionTile; class SpriteAtlas; class SpriteStore; diff --git a/src/mbgl/shader/dot.fragment.glsl b/src/mbgl/shader/dot.fragment.glsl deleted file mode 100644 index 6d998b561..000000000 --- a/src/mbgl/shader/dot.fragment.glsl +++ /dev/null @@ -1,9 +0,0 @@ -uniform vec4 u_color; -uniform float u_blur; - -void main() { - float dist = length(gl_PointCoord - 0.5); - float t = smoothstep(0.5, 0.5 - u_blur, dist); - - gl_FragColor = u_color * t; -} diff --git a/src/mbgl/shader/dot.vertex.glsl b/src/mbgl/shader/dot.vertex.glsl deleted file mode 100644 index 5310ae745..000000000 --- a/src/mbgl/shader/dot.vertex.glsl +++ /dev/null @@ -1,9 +0,0 @@ -uniform mat4 u_matrix; -uniform float u_size; - -attribute vec2 a_pos; - -void main(void) { - gl_Position = u_matrix * vec4(a_pos, 0, 1); - gl_PointSize = u_size; -} diff --git a/src/mbgl/shader/dot_shader.cpp b/src/mbgl/shader/dot_shader.cpp deleted file mode 100644 index 9d60306da..000000000 --- a/src/mbgl/shader/dot_shader.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include -#include -#include - -#include - -using namespace mbgl; - -DotShader::DotShader(gl::GLObjectStore& glObjectStore) - : Shader("dot", shaders::dot::vertex, shaders::dot::fragment, glObjectStore) { -} - -void DotShader::bind(GLbyte* offset) { - MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos)); - MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 8, offset)); -} diff --git a/src/mbgl/shader/dot_shader.hpp b/src/mbgl/shader/dot_shader.hpp deleted file mode 100644 index 99cf2b92d..000000000 --- a/src/mbgl/shader/dot_shader.hpp +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include -#include - -namespace mbgl { - -class DotShader : public Shader { -public: - DotShader(gl::GLObjectStore&); - - void bind(GLbyte *offset) final; - - UniformMatrix<4> u_matrix = {"u_matrix", *this}; - Uniform> u_color = {"u_color", *this}; - Uniform u_size = {"u_size", *this}; - Uniform u_blur = {"u_blur", *this}; -}; - -} // namespace mbgl