From 033953413ac95888932acee7661d743693f83aa8 Mon Sep 17 00:00:00 2001
From: Molly Lloyd <molly@mapbox.com>
Date: Mon, 24 Jul 2017 17:03:38 -0700
Subject: [PATCH] ignore unsupported dds property tests

---
 mapbox-gl-js                             | 2 +-
 platform/node/test/ignores.json          | 2 ++
 src/mbgl/renderer/render_static_data.cpp | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mapbox-gl-js b/mapbox-gl-js
index 0c225291ab7..26fd5532a15 160000
--- a/mapbox-gl-js
+++ b/mapbox-gl-js
@@ -1 +1 @@
-Subproject commit 0c225291ab77c6aa5e4b4ca41168c1e501d94be1
+Subproject commit 26fd5532a15de3ffa9df5664656fd45d014532b7
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
index 1fbb93a4fae..0459da0f4f8 100644
--- a/platform/node/test/ignores.json
+++ b/platform/node/test/ignores.json
@@ -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",
diff --git a/src/mbgl/renderer/render_static_data.cpp b/src/mbgl/renderer/render_static_data.cpp
index 4c6028d7b61..ccf239e643f 100644
--- a/src/mbgl/renderer/render_static_data.cpp
+++ b/src/mbgl/renderer/render_static_data.cpp
@@ -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;
 }