[core] Update gl-js for shader change

7 files changed, 12 insertions, 13 deletions

diff --git a/mapbox-gl-js b/mapbox-gl-js
-Subproject ef5582dd3bc5c15a3112e875ed66494dab8e9d0
+Subproject caf8f57673a6f0b12cada7a27b0b55efaa96779
diff --git a/package.json b/package.json
index cdf7a338f8..4633b4bc4d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "express": "^4.11.1",
     "lodash": "^4.16.4",
     "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#49e8b407bdbbe6f7c92dbcb56d3d51f425fc2653",
-    "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#da53a81453068f4c2b440f9077d6bd5e7e14ff3d",
+    "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#2bdca923fc4190156b5a22af71be29442451db54",
     "mkdirp": "^0.5.1",
     "node-cmake": "^1.2.1",
     "pixelmatch": "^4.0.2",
diff --git a/src/mbgl/programs/raster_program.hpp b/src/mbgl/programs/raster_program.hpp
index d6179904d2..9aa25cf90c 100644
--- a/src/mbgl/programs/raster_program.hpp
+++ b/src/mbgl/programs/raster_program.hpp
@@ -11,8 +11,7 @@ namespace mbgl {
 namespace uniforms {
 MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_image0);
 MBGL_DEFINE_UNIFORM_SCALAR(gl::TextureUnit, u_image1);
-MBGL_DEFINE_UNIFORM_SCALAR(float, u_opacity0);
-MBGL_DEFINE_UNIFORM_SCALAR(float, u_opacity1);
+MBGL_DEFINE_UNIFORM_SCALAR(float, u_fade_t);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_buffer_scale);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_brightness_low);
 MBGL_DEFINE_UNIFORM_SCALAR(float, u_brightness_high);
@@ -35,8 +34,8 @@ class RasterProgram : public Program<
         uniforms::u_matrix,
         uniforms::u_image0,
         uniforms::u_image1,
-        uniforms::u_opacity0,
-        uniforms::u_opacity1,
+        uniforms::u_opacity,
+        uniforms::u_fade_t,
         uniforms::u_brightness_low,
         uniforms::u_brightness_high,
         uniforms::u_saturation_factor,
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>()) },
diff --git a/src/mbgl/renderer/raster_bucket.cpp b/src/mbgl/renderer/raster_bucket.cpp
index 0355911296..f328ad9313 100644
--- a/src/mbgl/renderer/raster_bucket.cpp
+++ b/src/mbgl/renderer/raster_bucket.cpp
@@ -8,12 +8,11 @@ namespace mbgl {
 
 using namespace style;
 
-RasterBucket::RasterBucket(PremultipliedImage&& image_) : image(std::move(image_)) {
+RasterBucket::RasterBucket(UnassociatedImage&& image_) : image(std::move(image_)) {
 }
 
 void RasterBucket::upload(gl::Context& context) {
-    texture = context.createTexture(image);
-    image = {};
+    texture = context.createTexture(std::move(image));
     uploaded = true;
 }
 
diff --git a/src/mbgl/renderer/raster_bucket.hpp b/src/mbgl/renderer/raster_bucket.hpp
index 9648e954bd..20969cf6b8 100644
--- a/src/mbgl/renderer/raster_bucket.hpp
+++ b/src/mbgl/renderer/raster_bucket.hpp
@@ -9,13 +9,13 @@ namespace mbgl {
 
 class RasterBucket : public Bucket {
 public:
-    RasterBucket(PremultipliedImage&&);
+    RasterBucket(UnassociatedImage&&);
 
     void upload(gl::Context&) override;
     void render(Painter&, PaintParameters&, const style::Layer&, const RenderTile&) override;
     bool hasData() const override;
 
-    PremultipliedImage image;
+    UnassociatedImage image;
     optional<gl::Texture> texture;
 };
 
diff --git a/src/mbgl/tile/raster_tile_worker.cpp b/src/mbgl/tile/raster_tile_worker.cpp
index 443ee10400..219e9a2e41 100644
--- a/src/mbgl/tile/raster_tile_worker.cpp
+++ b/src/mbgl/tile/raster_tile_worker.cpp
@@ -2,6 +2,7 @@
 #include <mbgl/tile/raster_tile.hpp>
 #include <mbgl/renderer/raster_bucket.cpp>
 #include <mbgl/actor/actor.hpp>
+#include <mbgl/util/premultiply.hpp>
 
 namespace mbgl {
 
@@ -16,7 +17,7 @@ void RasterTileWorker::parse(std::shared_ptr<const std::string> data) {
     }
 
     try {
-        auto bucket = std::make_unique<RasterBucket>(decodeImage(*data));
+        auto bucket = std::make_unique<RasterBucket>(util::unpremultiply(decodeImage(*data)));
         parent.invoke(&RasterTile::onParsed, std::move(bucket));
     } catch (...) {
         parent.invoke(&RasterTile::onError, std::current_exception());