summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/painter_raster.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-12-22 17:02:40 -0800
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-12-23 10:49:51 -0800
commit65c28deefe9a5ee65c22f6366b14259a6ef6578a (patch)
tree7d0144b5e797aca65e430df8eb8688b9487e6642 /src/mbgl/renderer/painter_raster.cpp
parent083cee8956e6aa89eefe93df6e5c286a1b6728b8 (diff)
downloadqtlocation-mapboxgl-65c28deefe9a5ee65c22f6366b14259a6ef6578a.tar.gz
[core] Update gl-js for shader change
Diffstat (limited to 'src/mbgl/renderer/painter_raster.cpp')
-rw-r--r--src/mbgl/renderer/painter_raster.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp
index 96bb6dc565..dcf2644140 100644
--- a/src/mbgl/renderer/painter_raster.cpp
+++ b/src/mbgl/renderer/painter_raster.cpp
@@ -64,8 +64,8 @@ void Painter::renderRaster(PaintParameters& parameters,
uniforms::u_matrix::Value{ tile.matrix },
uniforms::u_image0::Value{ 0 },
uniforms::u_image1::Value{ 1 },
- uniforms::u_opacity0::Value{ properties.get<RasterOpacity>() },
- uniforms::u_opacity1::Value{ 0 },
+ uniforms::u_opacity::Value{ properties.get<RasterOpacity>() },
+ uniforms::u_fade_t::Value{ 1 },
uniforms::u_brightness_low::Value{ properties.get<RasterBrightnessMin>() },
uniforms::u_brightness_high::Value{ properties.get<RasterBrightnessMax>() },
uniforms::u_saturation_factor::Value{ saturationFactor(properties.get<RasterSaturation>()) },