Raster styling all functional except brightness -- need to rework parsing

2 files changed, 21 insertions, 0 deletions

diff --git a/include/mbgl/renderer/painter.hpp b/include/mbgl/renderer/painter.hpp
index db85d8703d..26e1bd3955 100644
--- a/include/mbgl/renderer/painter.hpp
+++ b/include/mbgl/renderer/painter.hpp
@@ -88,6 +88,7 @@ public:
     void renderLine(LineBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id, const mat4 &matrix);
     void renderSymbol(SymbolBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id, const mat4 &matrix);
     void renderRaster(RasterBucket& bucket, std::shared_ptr<StyleLayer> layer_desc, const Tile::ID& id, const mat4 &matrix);
+    std::array<float, 3> spinWeights(float spin_value);
 
     void preparePrerender(RasterBucket &bucket);
 
diff --git a/include/mbgl/shader/raster_shader.hpp b/include/mbgl/shader/raster_shader.hpp
index ec69fa7238..e27f2b4f2e 100644
--- a/include/mbgl/shader/raster_shader.hpp
+++ b/include/mbgl/shader/raster_shader.hpp
@@ -14,6 +14,10 @@ public:
     void setImage(int32_t image);
     void setOpacity(float opacity);
     void setBuffer(float buffer);
+    void setBrightness(float brightness_low, float brightness_high);
+    void setSaturation(float saturation_factor);
+    void setContrast(float contrast_factor);
+    void setSpin(std::array<float, 3> spin_weights);
 
 private:
     int32_t a_pos = -1;
@@ -26,6 +30,22 @@ private:
 
     float buffer = 0;
     int32_t u_buffer = -1;
+
+    float brightness_low = 0;
+    int32_t u_brightness_low = -1;
+
+    float brightness_high = 1;
+    int32_t u_brightness_high = -1;
+
+    float saturation_factor = 0;
+    int32_t u_saturation_factor = -1;
+
+    float contrast_factor = 1;
+    int32_t u_contrast_factor = -1;
+
+    std::array<float, 3> spin_weights = {{}};
+    int32_t u_spin_weights = -1;
+
 };
 
 }