diff --git a/src/mbgl/renderer/painter.cpp b/src/mbgl/renderer/painter.cpp index 4a9b12175..1c6c69a7c 100644 --- a/src/mbgl/renderer/painter.cpp +++ b/src/mbgl/renderer/painter.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include @@ -67,7 +66,6 @@ void Painter::setup() { assert(sdfGlyphShader); assert(sdfIconShader); assert(dotShader); - assert(gaussianShader); // Blending @@ -101,7 +99,6 @@ void Painter::setupShaders() { if (!sdfGlyphShader) sdfGlyphShader = std::make_unique(); if (!sdfIconShader) sdfIconShader = std::make_unique(); if (!dotShader) dotShader = std::make_unique(); - if (!gaussianShader) gaussianShader = std::make_unique(); if (!collisionBoxShader) collisionBoxShader = std::make_unique(); } diff --git a/src/mbgl/renderer/painter.hpp b/src/mbgl/renderer/painter.hpp index e5aeb3bf5..34f48420b 100644 --- a/src/mbgl/renderer/painter.hpp +++ b/src/mbgl/renderer/painter.hpp @@ -56,7 +56,6 @@ class RasterShader; class SDFGlyphShader; class SDFIconShader; class DotShader; -class GaussianShader; class CollisionBoxShader; struct ClipID; @@ -227,7 +226,6 @@ public: std::unique_ptr sdfGlyphShader; std::unique_ptr sdfIconShader; std::unique_ptr dotShader; - std::unique_ptr gaussianShader; std::unique_ptr collisionBoxShader; StaticVertexBuffer backgroundBuffer = { @@ -252,7 +250,6 @@ public: VertexArrayObject coveringPlainArray; VertexArrayObject coveringRasterArray; - VertexArrayObject coveringGaussianArray; // Set up the tile boundary lines we're using to draw the tile outlines. StaticVertexBuffer tileBorderBuffer = { diff --git a/src/mbgl/shader/gaussian.fragment.glsl b/src/mbgl/shader/gaussian.fragment.glsl deleted file mode 100644 index ee8406e9e..000000000 --- a/src/mbgl/shader/gaussian.fragment.glsl +++ /dev/null @@ -1,11 +0,0 @@ -uniform sampler2D u_image; - -varying vec2 v_coords[3]; - -void main() { - vec4 sum = vec4(0.0); - sum += texture2D(u_image, v_coords[0]) * 0.40261994689424746; - sum += texture2D(u_image, v_coords[1]) * 0.2986900265528763; - sum += texture2D(u_image, v_coords[2]) * 0.2986900265528763; - gl_FragColor = sum; -} diff --git a/src/mbgl/shader/gaussian.vertex.glsl b/src/mbgl/shader/gaussian.vertex.glsl deleted file mode 100644 index 26a839420..000000000 --- a/src/mbgl/shader/gaussian.vertex.glsl +++ /dev/null @@ -1,15 +0,0 @@ -attribute vec2 a_pos; - -uniform mat4 u_matrix; -uniform vec2 u_offset; - -varying vec2 v_coords[3]; - -void main() { - gl_Position = u_matrix * vec4(a_pos, 0, 1); - - vec2 tex = gl_Position.xy / 2.0 + 0.5; - v_coords[0] = tex; - v_coords[1] = tex + u_offset * 1.1824255238063563; - v_coords[2] = tex - u_offset * 1.1824255238063563; -} diff --git a/src/mbgl/shader/gaussian_shader.cpp b/src/mbgl/shader/gaussian_shader.cpp deleted file mode 100644 index b7d593f2e..000000000 --- a/src/mbgl/shader/gaussian_shader.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include -#include - -#include - -using namespace mbgl; - -GaussianShader::GaussianShader() - : Shader( - "gaussian", - shaders[GAUSSIAN_SHADER].vertex, - shaders[GAUSSIAN_SHADER].fragment - ) { - a_pos = MBGL_CHECK_ERROR(glGetAttribLocation(program, "a_pos")); -} - -void GaussianShader::bind(char *offset) { - MBGL_CHECK_ERROR(glEnableVertexAttribArray(a_pos)); - MBGL_CHECK_ERROR(glVertexAttribPointer(a_pos, 2, GL_SHORT, false, 0, offset)); -} diff --git a/src/mbgl/shader/gaussian_shader.hpp b/src/mbgl/shader/gaussian_shader.hpp deleted file mode 100644 index 0f494f5c7..000000000 --- a/src/mbgl/shader/gaussian_shader.hpp +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef MBGL_RENDERER_SHADER_GAUSSIAN -#define MBGL_RENDERER_SHADER_GAUSSIAN - -#include -#include - -namespace mbgl { - -class GaussianShader : public Shader { -public: - GaussianShader(); - - void bind(char *offset); - - UniformMatrix<4> u_matrix = {"u_matrix", *this}; - Uniform> u_offset = {"u_offset", *this}; - Uniform u_image = {"u_image", *this}; - -private: - int32_t a_pos = -1; -}; - -} - -#endif