tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update mapbox-gl-js submodule to v0.53.0

Browse Source
This commit is contained in:
Mikhail Pozdnyakov
2019-03-06 11:59:15 +02:00
parent 8a8291d8f4
commit 06a8ecdb17
27 changed files with 921 additions and 864 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mapbox-gl-js

Submodule mapbox-gl-js updated: b235bb7557...fe03b706ff

38
platform/node/test/ignores.json
View File

@@ -76,6 +76,7 @@
"render-tests/custom-layer-js/depth": "skip - js specific",
"render-tests/custom-layer-js/null-island": "skip - js specific",
"render-tests/custom-layer-js/tent-3d": "skip - js specific",
"render-tests/regressions/mapbox-gl-js#7708": "skip - js specific",
"render-tests/debug/collision": "https://github.com/mapbox/mapbox-gl-native/issues/3841",
"render-tests/debug/collision-lines": "https://github.com/mapbox/mapbox-gl-native/issues/10412",
"render-tests/debug/collision-lines-overscaled": "https://github.com/mapbox/mapbox-gl-native/issues/10412",
@@ -147,5 +148,40 @@
"render-tests/symbol-sort-key/icon-expression": "https://github.com/mapbox/mapbox-gl-native/issues/14028",
"render-tests/symbol-sort-key/text-expression": "https://github.com/mapbox/mapbox-gl-native/issues/14028",
"render-tests/symbol-sort-key/text-placement": "https://github.com/mapbox/mapbox-gl-native/issues/14028",
"render-tests/fill-opacity/opaque-fill-over-symbol-layer": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/7612"
"render-tests/fill-opacity/opaque-fill-over-symbol-layer": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/7612",
"render-tests/text-radial-offset/basic": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/all-anchors-offset": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/all-anchors": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/icon-image-all-anchors": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/icon-image": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/no-animate-zoom": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/pitched-offset": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/pitched-rotated-debug": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/pitched-with-map": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/pitched": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/remember-last-placement": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/rotated-offset": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/rotated-with-map": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/rotated": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/single-justification": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/single-line": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-variable-anchor/top-bottom-left-right": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/text-justify/auto": "skip - port of https://github.com/mapbox/mapbox-gl-js/pull/7596",
"render-tests/geojson/clustered-properties": "https://github.com/mapbox/mapbox-gl-native/issues/14043",
"render-tests/remove-feature-state/composite-expression": "https://github.com/mapbox/mapbox-gl-native/issues/12413",
"render-tests/remove-feature-state/data-expression": "https://github.com/mapbox/mapbox-gl-native/issues/12413",
"render-tests/remove-feature-state/default": "https://github.com/mapbox/mapbox-gl-native/issues/12413",
"render-tests/remove-feature-state/vector-source": "https://github.com/mapbox/mapbox-gl-native/issues/12413",
"query-tests/remove-feature-state/default": "https://github.com/mapbox/mapbox-gl-native/issues/12413",
"query-tests/fill-extrusion/base-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/box-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/side-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/sort-concave-inner": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/sort-concave-outer": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/sort-rotated": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/sort": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"query-tests/fill-extrusion/top-in": "https://github.com/mapbox/mapbox-gl-native/issues/13139",
"expression-tests/number-format/currency": "https://github.com/mapbox/mapbox-gl-native/issues/13632",
"expression-tests/number-format/default": "https://github.com/mapbox/mapbox-gl-native/issues/13632",
"expression-tests/number-format/precision": "https://github.com/mapbox/mapbox-gl-native/issues/13632"
}

7
scripts/style-spec.js
View File

@@ -3,4 +3,9 @@ var spec = module.exports = require('../mapbox-gl-js/src/style-spec/reference/v8
// Make temporary modifications here when Native doesn't have all features that JS has.
delete spec.layout_symbol['symbol-sort-key'];
delete spec.layout_symbol['symbol-z-order'].values['auto'];
spec.layout_symbol['symbol-z-order'].default = 'viewport-y';
spec.layout_symbol['symbol-z-order'].default = 'viewport-y';
delete spec.layout_symbol['text-variable-anchor'];
delete spec.layout_symbol['text-radial-offset'];
delete spec.layout_symbol['text-justify'].values['auto'];
spec.layout_symbol['text-offset'].requires.splice(1, 1); // { "!": "text-radial-offset" }

1
src/mbgl/programs/attributes.hpp
View File

@@ -20,6 +20,7 @@ MBGL_DEFINE_ATTRIBUTE(uint8_t, 1, a_fade_opacity);
MBGL_DEFINE_ATTRIBUTE(uint8_t, 2, a_placed);
MBGL_DEFINE_ATTRIBUTE(uint16_t, 3, a_size);
MBGL_DEFINE_ATTRIBUTE(float, 1, a_offset);
MBGL_DEFINE_ATTRIBUTE(float, 2, a_shift);
template <typename T, std::size_t N>
struct a_data {

2
src/mbgl/programs/collision_box_program.cpp
View File

@@ -2,6 +2,6 @@
namespace mbgl {
static_assert(sizeof(CollisionBoxProgram::LayoutVertex) == 16, "expected CollisionBoxVertex size");
static_assert(sizeof(CollisionBoxProgram::LayoutVertex) == 24, "expected CollisionBoxVertex size");
} // namespace mbgl

11
src/mbgl/programs/collision_box_program.hpp
View File

@@ -15,7 +15,8 @@ namespace mbgl {
using CollisionBoxLayoutAttributes = TypeList<
attributes::a_pos,
attributes::a_anchor_pos,
attributes::a_extrude>;
attributes::a_extrude,
attributes::a_shift>;
using CollisionBoxDynamicAttributes = TypeList<attributes::a_placed>;
@@ -45,6 +46,10 @@ public:
{{
static_cast<int16_t>(::round(o.x)),
static_cast<int16_t>(::round(o.y))
}},
{{
0.0f,
0.0f
}}
};
}
@@ -132,6 +137,10 @@ public:
{{
static_cast<int16_t>(::round(o.x)),
static_cast<int16_t>(::round(o.y))
}},
{{
0.0f,
0.0f
}}
};
}

5
src/mbgl/shaders/collision_box.cpp
View File

@@ -8,7 +8,7 @@ namespace shaders {
const char* collision_box::name = "collision_box";
const char* collision_box::vertexSource = source() + 9956;
const char* collision_box::fragmentSource = source() + 10602;
const char* collision_box::fragmentSource = source() + 10635;
// Uncompressed source of collision_box.vertex.glsl:
/*
@@ -16,6 +16,7 @@ attribute vec2 a_pos;
attribute vec2 a_anchor_pos;
attribute vec2 a_extrude;
attribute vec2 a_placed;
attribute vec2 a_shift;
uniform mat4 u_matrix;
uniform vec2 u_extrude_scale;
@@ -33,7 +34,7 @@ void main() {
4.0);
gl_Position = u_matrix * vec4(a_pos, 0.0, 1.0);
gl_Position.xy += a_extrude * u_extrude_scale * gl_Position.w * collision_perspective_ratio;
gl_Position.xy += (a_extrude + a_shift) * u_extrude_scale * gl_Position.w * collision_perspective_ratio;
v_placed = a_placed.x;
v_notUsed = a_placed.y;

4
src/mbgl/shaders/collision_circle.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* collision_circle::name = "collision_circle";
const char* collision_circle::vertexSource = source() + 10825;
const char* collision_circle::fragmentSource = source() + 11741;
const char* collision_circle::vertexSource = source() + 10858;
const char* collision_circle::fragmentSource = source() + 11774;
// Uncompressed source of collision_circle.vertex.glsl:
/*

4
src/mbgl/shaders/debug.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* debug::name = "debug";
const char* debug::vertexSource = source() + 12417;
const char* debug::fragmentSource = source() + 12513;
const char* debug::vertexSource = source() + 12450;
const char* debug::fragmentSource = source() + 12546;
// Uncompressed source of debug.vertex.glsl:
/*

4
src/mbgl/shaders/extrusion_texture.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* extrusion_texture::name = "extrusion_texture";
const char* extrusion_texture::vertexSource = source() + 27521;
const char* extrusion_texture::fragmentSource = source() + 27701;
const char* extrusion_texture::vertexSource = source() + 27554;
const char* extrusion_texture::fragmentSource = source() + 27734;
// Uncompressed source of extrusion_texture.vertex.glsl:
/*

4
src/mbgl/shaders/fill.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* fill::name = "fill";
const char* fill::vertexSource = source() + 12577;
const char* fill::fragmentSource = source() + 13221;
const char* fill::vertexSource = source() + 12610;
const char* fill::fragmentSource = source() + 13254;
// Uncompressed source of fill.vertex.glsl:
/*

4
src/mbgl/shaders/fill_extrusion.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* fill_extrusion::name = "fill_extrusion";
const char* fill_extrusion::vertexSource = source() + 21205;
const char* fill_extrusion::fragmentSource = source() + 23088;
const char* fill_extrusion::vertexSource = source() + 21238;
const char* fill_extrusion::fragmentSource = source() + 23121;
// Uncompressed source of fill_extrusion.vertex.glsl:
/*

4
src/mbgl/shaders/fill_extrusion_pattern.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* fill_extrusion_pattern::name = "fill_extrusion_pattern";
const char* fill_extrusion_pattern::vertexSource = source() + 23204;
const char* fill_extrusion_pattern::fragmentSource = source() + 26124;
const char* fill_extrusion_pattern::vertexSource = source() + 23237;
const char* fill_extrusion_pattern::fragmentSource = source() + 26157;
// Uncompressed source of fill_extrusion_pattern.vertex.glsl:
/*

4
src/mbgl/shaders/fill_outline.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* fill_outline::name = "fill_outline";
const char* fill_outline::vertexSource = source() + 13645;
const char* fill_outline::fragmentSource = source() + 14470;
const char* fill_outline::vertexSource = source() + 13678;
const char* fill_outline::fragmentSource = source() + 14503;
// Uncompressed source of fill_outline.vertex.glsl:
/*

4
src/mbgl/shaders/fill_outline_pattern.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* fill_outline_pattern::name = "fill_outline_pattern";
const char* fill_outline_pattern::vertexSource = source() + 15059;
const char* fill_outline_pattern::fragmentSource = source() + 16919;
const char* fill_outline_pattern::vertexSource = source() + 15092;
const char* fill_outline_pattern::fragmentSource = source() + 16952;
// Uncompressed source of fill_outline_pattern.vertex.glsl:
/*

4
src/mbgl/shaders/fill_pattern.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* fill_pattern::name = "fill_pattern";
const char* fill_pattern::vertexSource = source() + 18226;
const char* fill_pattern::fragmentSource = source() + 20005;
const char* fill_pattern::vertexSource = source() + 18259;
const char* fill_pattern::fragmentSource = source() + 20038;
// Uncompressed source of fill_pattern.vertex.glsl:
/*

4
src/mbgl/shaders/hillshade.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* hillshade::name = "hillshade";
const char* hillshade::vertexSource = source() + 29307;
const char* hillshade::fragmentSource = source() + 29478;
const char* hillshade::vertexSource = source() + 29340;
const char* hillshade::fragmentSource = source() + 29511;
// Uncompressed source of hillshade.vertex.glsl:
/*

4
src/mbgl/shaders/hillshade_prepare.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* hillshade_prepare::name = "hillshade_prepare";
const char* hillshade_prepare::vertexSource = source() + 27892;
const char* hillshade_prepare::fragmentSource = source() + 28185;
const char* hillshade_prepare::vertexSource = source() + 27925;
const char* hillshade_prepare::fragmentSource = source() + 28218;
// Uncompressed source of hillshade_prepare.vertex.glsl:
/*

4
src/mbgl/shaders/line.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* line::name = "line";
const char* line::vertexSource = source() + 30552;
const char* line::fragmentSource = source() + 33476;
const char* line::vertexSource = source() + 30585;
const char* line::fragmentSource = source() + 33509;
// Uncompressed source of line.vertex.glsl:
/*

4
src/mbgl/shaders/line_gradient.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* line_gradient::name = "line_gradient";
const char* line_gradient::vertexSource = source() + 34302;
const char* line_gradient::fragmentSource = source() + 37021;
const char* line_gradient::vertexSource = source() + 34335;
const char* line_gradient::fragmentSource = source() + 37054;
// Uncompressed source of line_gradient.vertex.glsl:
/*

4
src/mbgl/shaders/line_pattern.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* line_pattern::name = "line_pattern";
const char* line_pattern::vertexSource = source() + 37808;
const char* line_pattern::fragmentSource = source() + 41129;
const char* line_pattern::vertexSource = source() + 37841;
const char* line_pattern::fragmentSource = source() + 41162;
// Uncompressed source of line_pattern.vertex.glsl:
/*

4
src/mbgl/shaders/line_sdf.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* line_sdf::name = "line_sdf";
const char* line_sdf::vertexSource = source() + 43442;
const char* line_sdf::fragmentSource = source() + 47056;
const char* line_sdf::vertexSource = source() + 43475;
const char* line_sdf::fragmentSource = source() + 47089;
// Uncompressed source of line_sdf.vertex.glsl:
/*

4
src/mbgl/shaders/raster.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* raster::name = "raster";
const char* raster::vertexSource = source() + 48559;
const char* raster::fragmentSource = source() + 48908;
const char* raster::vertexSource = source() + 48592;
const char* raster::fragmentSource = source() + 48941;
// Uncompressed source of raster.vertex.glsl:
/*

1642
src/mbgl/shaders/source.cpp
View File

File diff suppressed because it is too large Load Diff

4
src/mbgl/shaders/symbol_icon.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* symbol_icon::name = "symbol_icon";
const char* symbol_icon::vertexSource = source() + 49967;
const char* symbol_icon::fragmentSource = source() + 52621;
const char* symbol_icon::vertexSource = source() + 50000;
const char* symbol_icon::fragmentSource = source() + 52654;
// Uncompressed source of symbol_icon.vertex.glsl:
/*

4
src/mbgl/shaders/symbol_sdf.cpp
View File

@@ -7,8 +7,8 @@ namespace mbgl {
namespace shaders {
const char* symbol_sdf::name = "symbol_sdf";
const char* symbol_sdf::vertexSource = source() + 53026;
const char* symbol_sdf::fragmentSource = source() + 57066;
const char* symbol_sdf::vertexSource = source() + 53059;
const char* symbol_sdf::fragmentSource = source() + 57099;
// Uncompressed source of symbol_sdf.vertex.glsl:
/*

5
test/style/expression/expression.test.cpp
View File

@@ -36,7 +36,10 @@ TEST(Expression, IsExpression) {
// TODO: "feature-state": https://github.com/mapbox/mapbox-gl-native/issues/12613
// TODO: "interpolate-hcl": https://github.com/mapbox/mapbox-gl-native/issues/8720
// TODO: "interpolate-lab": https://github.com/mapbox/mapbox-gl-native/issues/8720
if (name == "feature-state" || name == "interpolate-hcl" || name == "interpolate-lab") {
// TODO: "number-format": https://github.com/mapbox/mapbox-gl-native/issues/13632
// TODO: "accumulated": https://github.com/mapbox/mapbox-gl-native/issues/14043
if (name == "feature-state" || name == "interpolate-hcl" || name == "interpolate-lab" || name == "number-format" ||
name == "accumulated") {
if (expression::isExpression(conversion::Convertible(expression))) {
ASSERT_TRUE(false) << "Expression name" << name << "is implemented - please update Expression.IsExpression test.";
}