diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-10 10:57:57 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-10-10 12:46:52 -0700 |
commit | 5891c7028dbc6ae6decb5a3b059fd48f4e700d44 (patch) | |
tree | 74299ff346112fb8873bf375652b483e80215e37 /src | |
parent | 740c995c2b37bd896c87b2d8e22d644e09bc3e42 (diff) | |
download | qtlocation-mapboxgl-5891c7028dbc6ae6decb5a3b059fd48f4e700d44.tar.gz |
Update mapbox-gl-shaders to 98a56d
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/shader/collision_box_shader.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/shader/fill_outline_pattern_shader.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/shader/fill_outline_shader.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/shader/fill_pattern_shader.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/shader/line_pattern_shader.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/shader/line_sdf_shader.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/shader/symbol_icon_shader.cpp | 10 | ||||
-rw-r--r-- | src/mbgl/shader/symbol_sdf_shader.cpp | 10 |
8 files changed, 40 insertions, 40 deletions
diff --git a/src/mbgl/shader/collision_box_shader.cpp b/src/mbgl/shader/collision_box_shader.cpp index a53821072d..d61c849cd1 100644 --- a/src/mbgl/shader/collision_box_shader.cpp +++ b/src/mbgl/shader/collision_box_shader.cpp @@ -1,14 +1,14 @@ #include <mbgl/shader/collision_box_shader.hpp> -#include <mbgl/shader/collisionbox.vertex.hpp> -#include <mbgl/shader/collisionbox.fragment.hpp> +#include <mbgl/shader/collision_box.vertex.hpp> +#include <mbgl/shader/collision_box.fragment.hpp> #include <mbgl/shader/collision_box_vertex.hpp> namespace mbgl { CollisionBoxShader::CollisionBoxShader(gl::Context& context) - : Shader(shaders::collisionbox::name, - shaders::collisionbox::vertex, - shaders::collisionbox::fragment, + : Shader(shaders::collision_box::name, + shaders::collision_box::vertex, + shaders::collision_box::fragment, context) { } diff --git a/src/mbgl/shader/fill_outline_pattern_shader.cpp b/src/mbgl/shader/fill_outline_pattern_shader.cpp index c41fda27fb..b03921d384 100644 --- a/src/mbgl/shader/fill_outline_pattern_shader.cpp +++ b/src/mbgl/shader/fill_outline_pattern_shader.cpp @@ -1,14 +1,14 @@ #include <mbgl/shader/fill_outline_pattern_shader.hpp> -#include <mbgl/shader/outlinepattern.vertex.hpp> -#include <mbgl/shader/outlinepattern.fragment.hpp> +#include <mbgl/shader/fill_outline_pattern.vertex.hpp> +#include <mbgl/shader/fill_outline_pattern.fragment.hpp> #include <mbgl/shader/fill_vertex.hpp> namespace mbgl { FillOutlinePatternShader::FillOutlinePatternShader(gl::Context& context, Defines defines) - : Shader(shaders::outlinepattern::name, - shaders::outlinepattern::vertex, - shaders::outlinepattern::fragment, + : Shader(shaders::fill_outline_pattern::name, + shaders::fill_outline_pattern::vertex, + shaders::fill_outline_pattern::fragment, context, defines) { } diff --git a/src/mbgl/shader/fill_outline_shader.cpp b/src/mbgl/shader/fill_outline_shader.cpp index e14004a6bd..6e6d8c2239 100644 --- a/src/mbgl/shader/fill_outline_shader.cpp +++ b/src/mbgl/shader/fill_outline_shader.cpp @@ -1,14 +1,14 @@ #include <mbgl/shader/fill_outline_shader.hpp> -#include <mbgl/shader/outline.vertex.hpp> -#include <mbgl/shader/outline.fragment.hpp> +#include <mbgl/shader/fill_outline.vertex.hpp> +#include <mbgl/shader/fill_outline.fragment.hpp> #include <mbgl/shader/fill_vertex.hpp> namespace mbgl { FillOutlineShader::FillOutlineShader(gl::Context& context, Defines defines) - : Shader(shaders::outline::name, - shaders::outline::vertex, - shaders::outline::fragment, + : Shader(shaders::fill_outline::name, + shaders::fill_outline::vertex, + shaders::fill_outline::fragment, context, defines) { } diff --git a/src/mbgl/shader/fill_pattern_shader.cpp b/src/mbgl/shader/fill_pattern_shader.cpp index 2cdfbc7940..60be6d79ad 100644 --- a/src/mbgl/shader/fill_pattern_shader.cpp +++ b/src/mbgl/shader/fill_pattern_shader.cpp @@ -1,14 +1,14 @@ #include <mbgl/shader/fill_pattern_shader.hpp> -#include <mbgl/shader/pattern.vertex.hpp> -#include <mbgl/shader/pattern.fragment.hpp> +#include <mbgl/shader/fill_pattern.vertex.hpp> +#include <mbgl/shader/fill_pattern.fragment.hpp> #include <mbgl/shader/fill_vertex.hpp> namespace mbgl { FillPatternShader::FillPatternShader(gl::Context& context, Defines defines) - : Shader(shaders::pattern::name, - shaders::pattern::vertex, - shaders::pattern::fragment, + : Shader(shaders::fill_pattern::name, + shaders::fill_pattern::vertex, + shaders::fill_pattern::fragment, context, defines) { } diff --git a/src/mbgl/shader/line_pattern_shader.cpp b/src/mbgl/shader/line_pattern_shader.cpp index bf091a7e86..e6bc32a5c9 100644 --- a/src/mbgl/shader/line_pattern_shader.cpp +++ b/src/mbgl/shader/line_pattern_shader.cpp @@ -1,14 +1,14 @@ #include <mbgl/shader/line_pattern_shader.hpp> -#include <mbgl/shader/linepattern.vertex.hpp> -#include <mbgl/shader/linepattern.fragment.hpp> +#include <mbgl/shader/line_pattern.vertex.hpp> +#include <mbgl/shader/line_pattern.fragment.hpp> #include <mbgl/shader/line_vertex.hpp> namespace mbgl { LinePatternShader::LinePatternShader(gl::Context& context, Defines defines) - : Shader(shaders::linepattern::name, - shaders::linepattern::vertex, - shaders::linepattern::fragment, + : Shader(shaders::line_pattern::name, + shaders::line_pattern::vertex, + shaders::line_pattern::fragment, context, defines) { } diff --git a/src/mbgl/shader/line_sdf_shader.cpp b/src/mbgl/shader/line_sdf_shader.cpp index 11583d716b..dd724365ea 100644 --- a/src/mbgl/shader/line_sdf_shader.cpp +++ b/src/mbgl/shader/line_sdf_shader.cpp @@ -1,14 +1,14 @@ #include <mbgl/shader/line_sdf_shader.hpp> -#include <mbgl/shader/linesdfpattern.vertex.hpp> -#include <mbgl/shader/linesdfpattern.fragment.hpp> +#include <mbgl/shader/line_sdf.vertex.hpp> +#include <mbgl/shader/line_sdf.fragment.hpp> #include <mbgl/shader/line_vertex.hpp> namespace mbgl { LineSDFShader::LineSDFShader(gl::Context& context, Defines defines) - : Shader(shaders::linesdfpattern::name, - shaders::linesdfpattern::vertex, - shaders::linesdfpattern::fragment, + : Shader(shaders::line_sdf::name, + shaders::line_sdf::vertex, + shaders::line_sdf::fragment, context, defines) { } diff --git a/src/mbgl/shader/symbol_icon_shader.cpp b/src/mbgl/shader/symbol_icon_shader.cpp index f0ca648c2a..2655a1c9b5 100644 --- a/src/mbgl/shader/symbol_icon_shader.cpp +++ b/src/mbgl/shader/symbol_icon_shader.cpp @@ -1,14 +1,14 @@ #include <mbgl/shader/symbol_icon_shader.hpp> -#include <mbgl/shader/icon.vertex.hpp> -#include <mbgl/shader/icon.fragment.hpp> +#include <mbgl/shader/symbol_icon.vertex.hpp> +#include <mbgl/shader/symbol_icon.fragment.hpp> #include <mbgl/shader/symbol_vertex.hpp> namespace mbgl { SymbolIconShader::SymbolIconShader(gl::Context& context, Defines defines) - : Shader(shaders::icon::name, - shaders::icon::vertex, - shaders::icon::fragment, + : Shader(shaders::symbol_icon::name, + shaders::symbol_icon::vertex, + shaders::symbol_icon::fragment, context, defines) { } diff --git a/src/mbgl/shader/symbol_sdf_shader.cpp b/src/mbgl/shader/symbol_sdf_shader.cpp index ab50fde278..63c3bd5a4a 100644 --- a/src/mbgl/shader/symbol_sdf_shader.cpp +++ b/src/mbgl/shader/symbol_sdf_shader.cpp @@ -1,14 +1,14 @@ #include <mbgl/shader/symbol_sdf_shader.hpp> -#include <mbgl/shader/sdf.vertex.hpp> -#include <mbgl/shader/sdf.fragment.hpp> +#include <mbgl/shader/symbol_sdf.vertex.hpp> +#include <mbgl/shader/symbol_sdf.fragment.hpp> #include <mbgl/shader/symbol_vertex.hpp> namespace mbgl { SymbolSDFShader::SymbolSDFShader(gl::Context& context, Defines defines) - : Shader(shaders::sdf::name, - shaders::sdf::vertex, - shaders::sdf::fragment, + : Shader(shaders::symbol_sdf::name, + shaders::symbol_sdf::vertex, + shaders::symbol_sdf::fragment, context, defines) { } |