From 5891c7028dbc6ae6decb5a3b059fd48f4e700d44 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Mon, 10 Oct 2016 10:57:57 -0700 Subject: [PATCH] Update mapbox-gl-shaders to 98a56d --- cmake/shaders.cmake | 16 ++++++++-------- package.json | 2 +- src/mbgl/shader/collision_box_shader.cpp | 10 +++++----- src/mbgl/shader/fill_outline_pattern_shader.cpp | 10 +++++----- src/mbgl/shader/fill_outline_shader.cpp | 10 +++++----- src/mbgl/shader/fill_pattern_shader.cpp | 10 +++++----- src/mbgl/shader/line_pattern_shader.cpp | 10 +++++----- src/mbgl/shader/line_sdf_shader.cpp | 10 +++++----- src/mbgl/shader/symbol_icon_shader.cpp | 10 +++++----- src/mbgl/shader/symbol_sdf_shader.cpp | 10 +++++----- 10 files changed, 49 insertions(+), 49 deletions(-) diff --git a/cmake/shaders.cmake b/cmake/shaders.cmake index 5495f5b28..bebf476bb 100644 --- a/cmake/shaders.cmake +++ b/cmake/shaders.cmake @@ -15,15 +15,15 @@ function(add_shader VAR name) endfunction() add_shader(MBGL_SHADER_FILES circle) -add_shader(MBGL_SHADER_FILES collisionbox) +add_shader(MBGL_SHADER_FILES collision_box) add_shader(MBGL_SHADER_FILES debug) add_shader(MBGL_SHADER_FILES fill) -add_shader(MBGL_SHADER_FILES icon) +add_shader(MBGL_SHADER_FILES fill_outline) +add_shader(MBGL_SHADER_FILES fill_outline_pattern) +add_shader(MBGL_SHADER_FILES fill_pattern) add_shader(MBGL_SHADER_FILES line) -add_shader(MBGL_SHADER_FILES linepattern) -add_shader(MBGL_SHADER_FILES linesdfpattern) -add_shader(MBGL_SHADER_FILES outline) -add_shader(MBGL_SHADER_FILES outlinepattern) -add_shader(MBGL_SHADER_FILES pattern) +add_shader(MBGL_SHADER_FILES line_pattern) +add_shader(MBGL_SHADER_FILES line_sdf) add_shader(MBGL_SHADER_FILES raster) -add_shader(MBGL_SHADER_FILES sdf) +add_shader(MBGL_SHADER_FILES symbol_icon) +add_shader(MBGL_SHADER_FILES symbol_sdf) diff --git a/package.json b/package.json index 0c27cbe95..b744ea6d5 100644 --- a/package.json +++ b/package.json @@ -20,7 +20,7 @@ "csscolorparser": "^1.0.2", "ejs": "^2.4.1", "express": "^4.11.1", - "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#de2ab007455aa2587c552694c68583f94c9f2747", + "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#98a56d538b11fb331aa67a6d632d6ecd6821b007", "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#7f62a4fc9f21e619824d68abbc4b03cbc1685572", "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#694f0d0728f229d64d1639dc5ee7aff7f4b8ca41", "mkdirp": "^0.5.1", diff --git a/src/mbgl/shader/collision_box_shader.cpp b/src/mbgl/shader/collision_box_shader.cpp index a53821072..d61c849cd 100644 --- a/src/mbgl/shader/collision_box_shader.cpp +++ b/src/mbgl/shader/collision_box_shader.cpp @@ -1,14 +1,14 @@ #include -#include -#include +#include +#include #include 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 c41fda27f..b03921d38 100644 --- a/src/mbgl/shader/fill_outline_pattern_shader.cpp +++ b/src/mbgl/shader/fill_outline_pattern_shader.cpp @@ -1,14 +1,14 @@ #include -#include -#include +#include +#include #include 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 e14004a6b..6e6d8c223 100644 --- a/src/mbgl/shader/fill_outline_shader.cpp +++ b/src/mbgl/shader/fill_outline_shader.cpp @@ -1,14 +1,14 @@ #include -#include -#include +#include +#include #include 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 2cdfbc794..60be6d79a 100644 --- a/src/mbgl/shader/fill_pattern_shader.cpp +++ b/src/mbgl/shader/fill_pattern_shader.cpp @@ -1,14 +1,14 @@ #include -#include -#include +#include +#include #include 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 bf091a7e8..e6bc32a5c 100644 --- a/src/mbgl/shader/line_pattern_shader.cpp +++ b/src/mbgl/shader/line_pattern_shader.cpp @@ -1,14 +1,14 @@ #include -#include -#include +#include +#include #include 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 11583d716..dd724365e 100644 --- a/src/mbgl/shader/line_sdf_shader.cpp +++ b/src/mbgl/shader/line_sdf_shader.cpp @@ -1,14 +1,14 @@ #include -#include -#include +#include +#include #include 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 f0ca648c2..2655a1c9b 100644 --- a/src/mbgl/shader/symbol_icon_shader.cpp +++ b/src/mbgl/shader/symbol_icon_shader.cpp @@ -1,14 +1,14 @@ #include -#include -#include +#include +#include #include 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 ab50fde27..63c3bd5a4 100644 --- a/src/mbgl/shader/symbol_sdf_shader.cpp +++ b/src/mbgl/shader/symbol_sdf_shader.cpp @@ -1,14 +1,14 @@ #include -#include -#include +#include +#include #include 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) { }