[core] Update RasterShader

Ref: https://github.com/mapbox/mapbox-gl-shaders/issues/1

1 files changed, 14 insertions, 7 deletions

diff --git a/src/mbgl/renderer/painter_raster.cpp b/src/mbgl/renderer/painter_raster.cpp
index c137caf2f6..6f2352b0cd 100644
--- a/src/mbgl/renderer/painter_raster.cpp
+++ b/src/mbgl/renderer/painter_raster.cpp
@@ -18,12 +18,16 @@ void Painter::renderRaster(RasterBucket& bucket,
     const RasterPaintProperties& properties = layer.impl->paint;
 
     if (bucket.hasData()) {
-        const auto& shaderRaster = isOverdraw() ? rasterOverdrawShader : rasterShader;
-        auto& vaoRaster = isOverdraw() ? coveringRasterOverdrawArray : coveringRasterArray;
+        const bool overdraw = isOverdraw();
+        const auto& shaderRaster = overdraw ? rasterOverdrawShader : rasterShader;
+        auto& vaoRaster = overdraw ? coveringRasterOverdrawArray : coveringRasterArray;
+
         config.program = shaderRaster->getID();
         shaderRaster->u_matrix = matrix;
-        shaderRaster->u_buffer = 0;
-        shaderRaster->u_opacity = properties.rasterOpacity;
+        shaderRaster->u_buffer_scale = 1.0f;
+        shaderRaster->u_opacity0 = properties.rasterOpacity;
+        shaderRaster->u_opacity1 = 1.0f - properties.rasterOpacity;
+
         shaderRaster->u_brightness_low = properties.rasterBrightnessMin;
         shaderRaster->u_brightness_high = properties.rasterBrightnessMax;
         shaderRaster->u_saturation_factor = saturationFactor(properties.rasterSaturation);
@@ -32,14 +36,17 @@ void Painter::renderRaster(RasterBucket& bucket,
 
         config.stencilTest = GL_FALSE;
 
-        shaderRaster->u_image = 0;
-        config.activeTexture = GL_TEXTURE0;
+        shaderRaster->u_image0 = 0; // GL_TEXTURE0
+        shaderRaster->u_image1 = 1; // GL_TEXTURE1
+        shaderRaster->u_tl_parent = {{ 0.0f, 0.0f }};
+        shaderRaster->u_scale_parent = 1.0f;
 
         config.depthFunc.reset();
         config.depthTest = GL_TRUE;
         config.depthMask = GL_FALSE;
         setDepthSublayer(0);
-        bucket.drawRaster(*shaderRaster, tileStencilBuffer, vaoRaster, store);
+
+        bucket.drawRaster(*shaderRaster, rasterBoundsBuffer, vaoRaster, config, store);
     }
 }