diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2017-06-14 13:07:32 +0200 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-07-17 09:19:02 -0700 |
| commit | e8272ebdbb6e4788e82e4c4555f8ef8225d4013c (patch) | |
| tree | 58178006a450f76f4b30d23a51aae0d290a9921a | |
| parent | 874244a65680c4f99b1b549b979e511f37c1542b (diff) | |
| download | qtlocation-mapboxgl-e8272ebdbb6e4788e82e4c4555f8ef8225d4013c.tar.gz | |
[core] rename a_gap_width => a_gapwidth, u_gap_width => u_gapwidth to reflect naming in the shader
not sure how this ever worked
| -rw-r--r-- | src/mbgl/programs/attributes.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/programs/uniforms.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/style/layers/line_layer_properties.hpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp index cfd6a629de..a0b2b93e16 100644 --- a/src/mbgl/programs/attributes.hpp +++ b/src/mbgl/programs/attributes.hpp @@ -106,7 +106,7 @@ struct a_base { using Type = gl::Attribute<float, 1>; }; -struct a_gap_width { +struct a_gapwidth { static auto name() { return "a_gapwidth"; } using Type = gl::Attribute<float, 1>; }; diff --git a/src/mbgl/programs/uniforms.hpp b/src/mbgl/programs/uniforms.hpp index 60a50a7cb2..32d857a94e 100644 --- a/src/mbgl/programs/uniforms.hpp +++ b/src/mbgl/programs/uniforms.hpp @@ -27,7 +27,7 @@ MBGL_DEFINE_UNIFORM_SCALAR(float, u_halo_blur); MBGL_DEFINE_UNIFORM_SCALAR(Color, u_outline_color); MBGL_DEFINE_UNIFORM_SCALAR(float, u_height); MBGL_DEFINE_UNIFORM_SCALAR(float, u_base); -MBGL_DEFINE_UNIFORM_SCALAR(float, u_gap_width); +MBGL_DEFINE_UNIFORM_SCALAR(float, u_gapwidth); MBGL_DEFINE_UNIFORM_SCALAR(float, u_offset); MBGL_DEFINE_UNIFORM_SCALAR(Size, u_world); diff --git a/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp index 0b234921ad..6c301e6a0e 100644 --- a/src/mbgl/style/layers/line_layer_properties.hpp +++ b/src/mbgl/style/layers/line_layer_properties.hpp @@ -51,7 +51,7 @@ struct LineWidth : PaintProperty<float> { static float defaultValue() { return 1; } }; -struct LineGapWidth : DataDrivenPaintProperty<float, attributes::a_gap_width, uniforms::u_gap_width> { +struct LineGapWidth : DataDrivenPaintProperty<float, attributes::a_gapwidth, uniforms::u_gapwidth> { static float defaultValue() { return 0; } }; |