take 2, still not working

5 files changed, 9 insertions, 6 deletions

diff --git a/include/mbgl/map/tile_parser.hpp b/include/mbgl/map/tile_parser.hpp
index 9aa0f4dc66..313431c869 100644
--- a/include/mbgl/map/tile_parser.hpp
+++ b/include/mbgl/map/tile_parser.hpp
@@ -22,6 +22,7 @@ class Sprite;
 class Style;
 class StyleBucket;
 class StyleBucketFill;
+class StyleBucketRaster;
 class StyleBucketLine;
 class StyleBucketSymbol;
 class StyleLayerGroup;
@@ -45,6 +46,7 @@ private:
     std::unique_ptr<Bucket> createBucket(std::shared_ptr<StyleBucket> bucket_desc);
 
     std::unique_ptr<Bucket> createFillBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketFill &fill);
+    std::unique_ptr<Bucket> createRasterBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketRaster &raster);
     std::unique_ptr<Bucket> createLineBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketLine &line);
     std::unique_ptr<Bucket> createSymbolBucket(const VectorTileLayer& layer, const FilterExpression &filter, const StyleBucketSymbol &symbol);
 
diff --git a/include/mbgl/renderer/prerendered_texture.hpp b/include/mbgl/renderer/prerendered_texture.hpp
index 9c72e14b88..310375b5ea 100644
--- a/include/mbgl/renderer/prerendered_texture.hpp
+++ b/include/mbgl/renderer/prerendered_texture.hpp
@@ -4,6 +4,7 @@
 #include <mbgl/util/noncopyable.hpp>
 #include <mbgl/platform/gl.hpp>
 #include <mbgl/style/rasterize_properties.hpp>
+//#include <mbgl/renderer/raster_bucket.hpp>
 
 namespace mbgl {
 
@@ -11,7 +12,7 @@ class Painter;
 
 class PrerenderedTexture : private util::noncopyable {
 public:
-    PrerenderedTexture(const RasterizedProperties &properties);
+    PrerenderedTexture(const RasterBucket &properties);
     ~PrerenderedTexture();
 
     void bindTexture();
@@ -23,7 +24,7 @@ public:
     void blur(Painter& painter, uint16_t passes);
 
 public:
-    const RasterizedProperties properties;
+    const RasterBucket properties;
 
 private:
     GLint previous_fbo = 0;
diff --git a/include/mbgl/style/rasterize_properties.hpp b/include/mbgl/style/rasterize_properties.hpp
index e1e56d6ec9..e156ede77b 100644
--- a/include/mbgl/style/rasterize_properties.hpp
+++ b/include/mbgl/style/rasterize_properties.hpp
@@ -15,7 +15,7 @@ public:
 
 class RasterizeProperties {
 public:
-//    Function<bool> enabled = ConstantFunction<bool>(false);                 // going to need to delete this? or keep ?
+    Function<bool> enabled = ConstantFunction<bool>(false);                                 // maybe delete?
     Function<float> buffer = ConstantFunction<float>(1.0f / 32.0f);
     Function<float> size = ConstantFunction<float>(256);
     Function<float> blur = ConstantFunction<float>(0);
diff --git a/include/mbgl/style/style_bucket.hpp b/include/mbgl/style/style_bucket.hpp
index 25786720b1..5cb1b69312 100644
--- a/include/mbgl/style/style_bucket.hpp
+++ b/include/mbgl/style/style_bucket.hpp
@@ -82,6 +82,7 @@ public:
 
 class StyleBucketRaster {
 public:
+    bool prerendered = false;
     uint16_t raster_size = 256;
     float blur = 0.0f;
     float buffer = 0.03125f;
diff --git a/include/mbgl/style/style_layer.hpp b/include/mbgl/style/style_layer.hpp
index 14d60ed9b6..bcda9950a2 100644
--- a/include/mbgl/style/style_layer.hpp
+++ b/include/mbgl/style/style_layer.hpp
@@ -20,8 +20,7 @@ class StyleLayerGroup;
 
 class StyleLayer {
 public:
-    StyleLayer(const std::string &id, std::map<ClassID, ClassProperties> &&styles,
-        std::unique_ptr<const RasterizeProperties> &&rasterize);
+    StyleLayer(const std::string &id, std::map<ClassID, ClassProperties> &&styles);
 
     template <typename T> const T &getProperties() {
         if (properties.is<T>()) {
@@ -83,7 +82,7 @@ public:
     // Rasterization properties are used for prerendering the tile to a bitmap,
     // which is then used as a raster image instead of rendering this layer
     // directly in every frame.
-    const std::unique_ptr<const RasterizeProperties> rasterize;
+//    const std::unique_ptr<const RasterizeProperties> rasterize;
 
     // Child layer array (if this layer has child layers).
     std::shared_ptr<StyleLayerGroup> layers;