summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorChris Loer <chris.loer@gmail.com>2018-04-19 13:06:42 -0700
committerChris Loer <chris.loer@mapbox.com>2018-04-25 14:39:03 -0700
commit60cce56d46cb52c73fcb14d3917c1c47c328b72e (patch)
tree9f1bc02f885d0bebc3db27614446530e0f1e8303 /scripts
parenta62745edf9ee2da1f6ebda07acfd8260f3696e50 (diff)
downloadqtlocation-mapboxgl-60cce56d46cb52c73fcb14d3917c1c47c328b72e.tar.gz
Bump GL JS pin to get tests for global symbol querying.
- Pulls over an update to line.vertex.glsl (looks like a no-op?) - Add test ignores for collator, is-supported-script, line-gradient - Exclude collator, is-supported-script, line-gradient from code generation.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/generate-shaders.js2
-rw-r--r--scripts/style-spec.js1
2 files changed, 3 insertions, 0 deletions
diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js
index b1eeffb8a0..6758793056 100755
--- a/scripts/generate-shaders.js
+++ b/scripts/generate-shaders.js
@@ -7,6 +7,8 @@ const outputPath = 'src/mbgl/shaders';
var shaders = require('../mapbox-gl-js/src/shaders');
+delete shaders.lineGradient;
+
require('./style-code');
writeIfModified(path.join(outputPath, 'preludes.hpp'), `// NOTE: DO NOT CHANGE THIS FILE. IT IS AUTOMATICALLY GENERATED.
diff --git a/scripts/style-spec.js b/scripts/style-spec.js
index 196adc0b32..dd9a127b70 100644
--- a/scripts/style-spec.js
+++ b/scripts/style-spec.js
@@ -1,3 +1,4 @@
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.paint_line['line-gradient'];