summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-07 14:43:59 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-06-07 15:04:02 +0300
commit8b28b6ab6b5735a51b15d76baae284658a633c9d (patch)
treef9215b54fbd709ea3f92e24c774787f14dd40cba /scripts
parentaa88ca4757f182dcab5b66172144701185ec28ab (diff)
downloadqtlocation-mapboxgl-8b28b6ab6b5735a51b15d76baae284658a633c9d.tar.gz
[core] Renamed OutlineShader's color uniform
Part of https://github.com/mapbox/mapbox-gl-shaders/issues/8.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/build-shaders.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/build-shaders.py b/scripts/build-shaders.py
index 60e8552123..d94a8cdd58 100755
--- a/scripts/build-shaders.py
+++ b/scripts/build-shaders.py
@@ -28,7 +28,7 @@ def replace_uniform_pragmas(line):
if pragma_mapbox_regex.match(line):
params = line.split()
u_method = params[2]
- u_name = "color" if color_regex.match(params[3]) else params[3]
+ u_name = params[3]
u_precision = params[4]
u_type = "vec4" if color_regex.match(u_name) else "float"
if u_method == "define":
@@ -37,10 +37,9 @@ def replace_uniform_pragmas(line):
type_ = u_type,
name = u_name)
else:
- return """ {precision} {type_} {glsl_name} = u_{name};""".format(
+ return """ {precision} {type_} {name} = u_{name};""".format(
precision = u_precision,
type_ = u_type,
- glsl_name = params[3],
name = u_name)
else:
return line