Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Commit

Permalink
[test] Bump gl-js pin.
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisLoer committed Sep 19, 2018
1 parent 2e93a9d commit ab8b6b7
Show file tree
Hide file tree
Showing 15 changed files with 1,580 additions and 1,570 deletions.
2 changes: 1 addition & 1 deletion mapbox-gl-js
Submodule mapbox-gl-js updated 47 files
+1 −1 build/generate-style-code.js
+11 −3 docs/components/expression-metadata.js
+16 −17 src/data/bucket/symbol_bucket.js
+0 −7 src/shaders/fill_extrusion.fragment.glsl
+4 −4 src/shaders/fill_extrusion.vertex.glsl
+1 −1 src/style-spec/expression/definitions/coalesce.js
+23 −15 src/style-spec/expression/definitions/coercion.js
+2 −61 src/style-spec/expression/definitions/collator.js
+4 −39 src/style-spec/expression/definitions/format.js
+21 −30 src/style-spec/expression/definitions/index.js
+1 −1 src/style-spec/expression/definitions/literal.js
+10 −5 src/style-spec/expression/index.js
+24 −21 src/style-spec/expression/parsing_context.js
+61 −0 src/style-spec/expression/types/collator.js
+41 −0 src/style-spec/expression/types/formatted.js
+21 −3 src/style-spec/expression/values.js
+5 −3 src/style-spec/function/convert.js
+1 −1 src/style-spec/reference/v8.json
+1 −1 src/style/style_layer/background_style_layer_properties.js
+1 −1 src/style/style_layer/circle_style_layer_properties.js
+1 −1 src/style/style_layer/fill_extrusion_style_layer_properties.js
+1 −1 src/style/style_layer/fill_style_layer_properties.js
+1 −1 src/style/style_layer/heatmap_style_layer_properties.js
+1 −1 src/style/style_layer/hillshade_style_layer_properties.js
+1 −1 src/style/style_layer/layer_properties.js.ejs
+1 −1 src/style/style_layer/line_style_layer_properties.js
+1 −1 src/style/style_layer/raster_style_layer_properties.js
+3 −3 src/style/style_layer/symbol_style_layer_properties.js
+1 −2 src/symbol/mergelines.js
+12 −20 src/symbol/shaping.js
+1 −2 src/symbol/symbol_layout.js
+6 −10 src/symbol/transform_text.js
+3 −5 test/integration/expression-tests/coalesce/inference/test.json
+14 −0 test/integration/expression-tests/concat/coercion/test.json
+0 −0 test/integration/expression-tests/format/basic/test.json
+50 −0 test/integration/expression-tests/format/coercion/test.json
+14 −0 test/integration/expression-tests/format/implicit-assert/test.json
+53 −0 test/integration/expression-tests/format/implicit-coerce/test.json
+53 −0 test/integration/expression-tests/format/implicit-omit/test.json
+53 −0 test/integration/expression-tests/format/implicit/test.json
+0 −0 test/integration/expression-tests/format/to-string/test.json
+6 −6 test/integration/expression-tests/legacy/interval/tokens-zoom/test.json
+10 −0 test/integration/expression-tests/to-boolean/2-ary/test.json
+10 −0 test/integration/expression-tests/to-string/2-ary/test.json
+24 −0 test/integration/expression-tests/to-string/implicit/test.json
+3 −3 test/unit/style-spec/migrate.test.js
+12 −11 test/unit/symbol/shaping.test.js
14 changes: 12 additions & 2 deletions platform/node/test/ignores.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
{
"expression-tests/collator/accent-equals-de": "Locale-specific behavior changes based on platform.",
"expression-tests/formatted/basic": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/formatted/to-string": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/basic": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/coercion": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/implicit": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/implicit-assert": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/implicit-coerce": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/implicit-omit": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/to-string": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/to-string": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/to-string": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/to-string": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/basic": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/format/to-string": "skip - https://github.com/mapbox/mapbox-gl-native/pull/12624",
"expression-tests/interpolate-hcl/linear": "https://github.com/mapbox/mapbox-gl-native/issues/8720",
"expression-tests/interpolate-lab/linear": "https://github.com/mapbox/mapbox-gl-native/issues/8720",
"expression-tests/is-supported-script/default": "This tests RTL text plugin behavior specific to GL JS",
Expand Down
4 changes: 2 additions & 2 deletions src/mbgl/shaders/extrusion_texture.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* extrusion_texture::name = "extrusion_texture";
const char* extrusion_texture::vertexSource = source() + 36148;
const char* extrusion_texture::fragmentSource = source() + 36364;
const char* extrusion_texture::vertexSource = source() + 35603;
const char* extrusion_texture::fragmentSource = source() + 35819;

} // namespace shaders
} // namespace mbgl
2 changes: 1 addition & 1 deletion src/mbgl/shaders/fill_extrusion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace shaders {

const char* fill_extrusion::name = "fill_extrusion";
const char* fill_extrusion::vertexSource = source() + 27816;
const char* fill_extrusion::fragmentSource = source() + 30653;
const char* fill_extrusion::fragmentSource = source() + 30616;

} // namespace shaders
} // namespace mbgl
4 changes: 2 additions & 2 deletions src/mbgl/shaders/fill_extrusion_pattern.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* fill_extrusion_pattern::name = "fill_extrusion_pattern";
const char* fill_extrusion_pattern::vertexSource = source() + 31293;
const char* fill_extrusion_pattern::fragmentSource = source() + 34571;
const char* fill_extrusion_pattern::vertexSource = source() + 30748;
const char* fill_extrusion_pattern::fragmentSource = source() + 34026;

} // namespace shaders
} // namespace mbgl
4 changes: 2 additions & 2 deletions src/mbgl/shaders/hillshade.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* hillshade::name = "hillshade";
const char* hillshade::vertexSource = source() + 39310;
const char* hillshade::fragmentSource = source() + 39509;
const char* hillshade::vertexSource = source() + 38765;
const char* hillshade::fragmentSource = source() + 38964;

} // namespace shaders
} // namespace mbgl
4 changes: 2 additions & 2 deletions src/mbgl/shaders/hillshade_prepare.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* hillshade_prepare::name = "hillshade_prepare";
const char* hillshade_prepare::vertexSource = source() + 36576;
const char* hillshade_prepare::fragmentSource = source() + 36790;
const char* hillshade_prepare::vertexSource = source() + 36031;
const char* hillshade_prepare::fragmentSource = source() + 36245;

} // namespace shaders
} // namespace mbgl
4 changes: 2 additions & 2 deletions src/mbgl/shaders/line.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* line::name = "line";
const char* line::vertexSource = source() + 42145;
const char* line::fragmentSource = source() + 46608;
const char* line::vertexSource = source() + 41600;
const char* line::fragmentSource = source() + 46063;

} // namespace shaders
} // namespace mbgl
4 changes: 2 additions & 2 deletions src/mbgl/shaders/line_gradient.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* line_gradient::name = "line_gradient";
const char* line_gradient::vertexSource = source() + 47780;
const char* line_gradient::fragmentSource = source() + 52089;
const char* line_gradient::vertexSource = source() + 47235;
const char* line_gradient::fragmentSource = source() + 51544;

} // namespace shaders
} // namespace mbgl
4 changes: 2 additions & 2 deletions src/mbgl/shaders/line_pattern.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* line_pattern::name = "line_pattern";
const char* line_pattern::vertexSource = source() + 53374;
const char* line_pattern::fragmentSource = source() + 58450;
const char* line_pattern::vertexSource = source() + 52829;
const char* line_pattern::fragmentSource = source() + 57905;

} // namespace shaders
} // namespace mbgl
4 changes: 2 additions & 2 deletions src/mbgl/shaders/line_sdf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* line_sdf::name = "line_sdf";
const char* line_sdf::vertexSource = source() + 61749;
const char* line_sdf::fragmentSource = source() + 67116;
const char* line_sdf::vertexSource = source() + 61204;
const char* line_sdf::fragmentSource = source() + 66571;

} // namespace shaders
} // namespace mbgl
4 changes: 2 additions & 2 deletions src/mbgl/shaders/raster.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {

const char* raster::name = "raster";
const char* raster::vertexSource = source() + 69042;
const char* raster::fragmentSource = source() + 69855;
const char* raster::vertexSource = source() + 68497;
const char* raster::fragmentSource = source() + 69310;

} // namespace shaders
} // namespace mbgl
Loading

0 comments on commit ab8b6b7

Please sign in to comment.