Update mapbox-gl-shaders to 98a56d

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)

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",

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) {
 }
 

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) {
 }
 

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) {
 }
 

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) {
 }
 

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) {
 }
 

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) {
 }
 

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) {
 }
 

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) {
 }