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

Commit

Permalink
ignore unsupported dds property tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Molly Lloyd committed Jul 25, 2017
1 parent d48cad5 commit 0339534
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion mapbox-gl-js
Submodule mapbox-gl-js updated 56 files
+6 −0 CHANGELOG.md
+1 −1 bench/benchmarks/buffer.js
+2 −0 ci-scripts/test.sh
+1 −1 flow-typed/point-geometry.js
+1 −1 flow-typed/vector-tile.js
+15 −9 package.json
+3 −3 src/data/bucket/line_bucket.js
+2 −2 src/data/bucket/symbol_bucket.js
+2 −2 src/data/feature_index.js
+1 −1 src/geo/transform.js
+1 −1 src/index.js
+3 −3 src/render/painter.js
+6 −1 src/shaders/debug.vertex.glsl
+6 −1 src/shaders/raster.vertex.glsl
+2 −2 src/source/geojson_wrapper.js
+4 −5 src/source/image_source.js
+1 −1 src/source/tile.js
+1 −1 src/source/vector_tile_worker_source.js
+1 −1 src/style-spec/function/index.js
+7 −2 src/style-spec/reference/v8.json
+1 −1 src/symbol/anchor.js
+1 −1 src/symbol/clip_line.js
+1 −1 src/symbol/collision_box.js
+5 −6 src/symbol/collision_tile.js
+1 −1 src/symbol/projection.js
+1 −1 src/symbol/quads.js
+1 −1 src/ui/bind_handlers.js
+1 −1 src/ui/camera.js
+1 −1 src/ui/map.js
+1 −1 src/ui/marker.js
+1 −1 src/ui/popup.js
+1 −1 src/util/dom.js
+1 −1 src/util/find_pole_of_inaccessibility.js
+1 −1 src/util/util.js
+ − test/integration/render-tests/line-join/property-function-dasharray/expected.png
+130 −0 test/integration/render-tests/line-join/property-function-dasharray/style.json
+ − test/integration/render-tests/line-join/property-function/expected.png
+129 −0 test/integration/render-tests/line-join/property-function/style.json
+11 −22 test/integration/render-tests/text-anchor/property-function/style.json
+5 −10 test/integration/render-tests/text-justify/property-function/style.json
+4 −8 test/integration/render-tests/text-transform/property-function/style.json
+2 −2 test/unit/data/fill_bucket.test.js
+2 −2 test/unit/data/line_bucket.test.js
+1 −1 test/unit/data/load_geometry.test.js
+1 −1 test/unit/data/symbol_bucket.test.js
+1 −1 test/unit/geo/transform.test.js
+51 −0 test/unit/style-spec/function.test.js
+1 −1 test/unit/symbol/check_max_angle.test.js
+1 −1 test/unit/symbol/collision_feature.js
+1 −1 test/unit/symbol/get_anchors.test.js
+1 −1 test/unit/symbol/mergelines.test.js
+1 −1 test/unit/ui/popup.test.js
+1 −1 test/unit/util/classify_rings.test.js
+1 −1 test/unit/util/find_pole_of_inaccessibility.test.js
+1 −1 test/unit/util/util.test.js
+22 −33 yarn.lock
2 changes: 2 additions & 0 deletions platform/node/test/ignores.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
"render-tests/icon-text-fit/width-padding": "https://github.com/mapbox/mapbox-gl-native/issues/5602",
"render-tests/icon-text-fit/width": "https://github.com/mapbox/mapbox-gl-native/issues/5602",
"render-tests/line-width/property-function": "https://github.com/mapbox/mapbox-gl-js/issues/3682#issuecomment-264348200",
"render-tests/line-join/property-function": "https://github.com/mapbox/mapbox-gl-js/pull/5020",
"render-tests/line-join/property-function-dasharray": "https://github.com/mapbox/mapbox-gl-js/pull/5020",
"render-tests/regressions/mapbox-gl-js#2305": "https://github.com/mapbox/mapbox-gl-native/issues/6927",
"render-tests/regressions/mapbox-gl-js#3010": "skip - needs issue",
"render-tests/regressions/mapbox-gl-js#3548": "skip - needs issue",
Expand Down
6 changes: 3 additions & 3 deletions src/mbgl/renderer/render_static_data.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ static gl::IndexVector<gl::LineStrip> tileLineStripIndices() {
static gl::VertexVector<RasterLayoutVertex> rasterVertices() {
gl::VertexVector<RasterLayoutVertex> result;
result.emplace_back(RasterProgram::layoutVertex({ 0, 0 }, { 0, 0 }));
result.emplace_back(RasterProgram::layoutVertex({ util::EXTENT, 0 }, { 32767, 0 }));
result.emplace_back(RasterProgram::layoutVertex({ 0, util::EXTENT }, { 0, 32767 }));
result.emplace_back(RasterProgram::layoutVertex({ util::EXTENT, util::EXTENT }, { 32767, 32767 }));
result.emplace_back(RasterProgram::layoutVertex({ util::EXTENT, 0 }, { util::EXTENT, 0 }));
result.emplace_back(RasterProgram::layoutVertex({ 0, util::EXTENT }, { 0, util::EXTENT }));
result.emplace_back(RasterProgram::layoutVertex({ util::EXTENT, util::EXTENT }, { util::EXTENT, util::EXTENT }));
return result;
}

Expand Down

0 comments on commit 0339534

Please sign in to comment.