summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Agafonkin <agafonkin@gmail.com>2019-06-12 14:09:38 +0300
committerVladimir Agafonkin <agafonkin@gmail.com>2019-06-12 14:09:38 +0300
commit0f16851ef5677d01eeede43de86fa613933b2915 (patch)
tree4b9b58e5a36eb382a7bccc8f41f64c181a8f2493
parent844299f1c3b22eed4bf07c37052b3c2ea35e2564 (diff)
downloadqtlocation-mapboxgl-upstream/consistent-uniform-names.tar.gz
m---------mapbox-gl-js0
-rwxr-xr-xscripts/generate-shaders.js5
2 files changed, 0 insertions, 5 deletions
diff --git a/mapbox-gl-js b/mapbox-gl-js
-Subproject b0a37a059af486e3577fad432904bc1341b17f5
+Subproject 5b415130e75561f6e0cfd6f652359b2e3a417bc
diff --git a/scripts/generate-shaders.js b/scripts/generate-shaders.js
index cb0c945f3c..197aca7a03 100755
--- a/scripts/generate-shaders.js
+++ b/scripts/generate-shaders.js
@@ -24,11 +24,6 @@ function basicMinify(src) {
}
for (const key in shaders) {
- // Rename a_*_t uniforms to u_*_t. This is a workaround until we can use
- // https://github.com/mapbox/mapbox-gl-js/pull/8055, which is blocked by
- // https://github.com/mapbox/mapbox-gl-native/issues/13984
- shaders[key].vertexSource = shaders[key].vertexSource.replace(/\ba_(\w+)_t\b/mg, 'u_$1_t');
-
const hash = crypto.createHash('sha1');
const vertex = concatenated.length;