6 files changed, 172 insertions, 5 deletions
diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp
index b0582b0bc2..5d7a6474cf 100644
--- a/src/mbgl/programs/attributes.hpp
+++ b/src/mbgl/programs/attributes.hpp
@@ -143,4 +143,9 @@ struct a_halo_blur {
 };
 
 } // namespace attributes
+
+struct PositionOnlyLayoutAttributes : gl::Attributes<
+    attributes::a_pos>
+{};
+
 } // namespace mbgl
diff --git a/src/mbgl/programs/background_program.cpp b/src/mbgl/programs/background_program.cpp
new file mode 100644
index 0000000000..52a9638d6b
--- /dev/null
+++ b/src/mbgl/programs/background_program.cpp
@@ -0,0 +1,47 @@
+#include <mbgl/programs/background_program.hpp>
+#include <mbgl/renderer/image_atlas.hpp>
+#include <mbgl/renderer/cross_faded_property_evaluator.hpp>
+#include <mbgl/tile/tile_id.hpp>
+#include <mbgl/map/transform_state.hpp>
+
+namespace mbgl {
+
+using namespace style;
+
+static_assert(sizeof(BackgroundLayoutVertex) == 4, "expected BackgroundLayoutVertex size");
+
+BackgroundPatternUniforms::Values
+BackgroundPatternUniforms::values(mat4 matrix,
+                                  float opacity,
+                                  Size atlasSize,
+                                  const ImagePosition& a,
+                                  const ImagePosition& b,
+                                  const Faded<std::string>& fading,
+                                  const UnwrappedTileID& tileID,
+                                  const TransformState& state)
+{
+    int32_t tileSizeAtNearestZoom = util::tileSize * state.zoomScale(state.getIntegerZoom() - tileID.canonical.z);
+    int32_t pixelX = tileSizeAtNearestZoom * (tileID.canonical.x + tileID.wrap * state.zoomScale(tileID.canonical.z));
+    int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
+
+    return BackgroundPatternUniforms::Values {
+        uniforms::u_matrix::Value{ matrix },
+        uniforms::u_opacity::Value{ opacity },
+        uniforms::u_texsize::Value{ atlasSize },
+        uniforms::u_pattern_tl_a::Value{ a.tl() },
+        uniforms::u_pattern_br_a::Value{ a.br() },
+        uniforms::u_pattern_tl_b::Value{ b.tl() },
+        uniforms::u_pattern_br_b::Value{ b.br() },
+        uniforms::u_pattern_size_a::Value{ a.displaySize() },
+        uniforms::u_pattern_size_b::Value{ b.displaySize() },
+        uniforms::u_scale_a::Value{ fading.fromScale },
+        uniforms::u_scale_b::Value{ fading.toScale },
+        uniforms::u_mix::Value{ fading.t },
+        uniforms::u_image::Value{ 0 },
+        uniforms::u_pixel_coord_upper::Value{ std::array<float, 2> {{ float(pixelX >> 16), float(pixelY >> 16) }} },
+        uniforms::u_pixel_coord_lower::Value{ std::array<float, 2> {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF) }} },
+        uniforms::u_tile_units_to_pixels::Value{ 1.0f / tileID.pixelsToTileUnits(1.0f, state.getIntegerZoom()) },
+    };
+}
+
+} // namespace mbgl
diff --git a/src/mbgl/programs/background_program.hpp b/src/mbgl/programs/background_program.hpp
new file mode 100644
index 0000000000..b76318938c
--- /dev/null
+++ b/src/mbgl/programs/background_program.hpp
@@ -0,0 +1,83 @@
+#pragma once
+
+#include <mbgl/programs/program.hpp>
+#include <mbgl/programs/attributes.hpp>
+#include <mbgl/programs/uniforms.hpp>
+#include <mbgl/shaders/background.hpp>
+#include <mbgl/shaders/background_pattern.hpp>
+#include <mbgl/util/geometry.hpp>
+#include <mbgl/util/mat4.hpp>
+#include <mbgl/util/size.hpp>
+#include <mbgl/style/layers/background_layer_properties.hpp>
+
+#include <string>
+
+namespace mbgl {
+
+class ImagePosition;
+class UnwrappedTileID;
+class TransformState;
+template <class> class Faded;
+
+using BackgroundLayoutAttributes = PositionOnlyLayoutAttributes;
+
+struct BackgroundUniforms : gl::Uniforms<
+    uniforms::u_matrix,
+    uniforms::u_color,
+    uniforms::u_opacity>
+{};
+
+struct BackgroundPatternUniforms : gl::Uniforms<
+    uniforms::u_matrix,
+    uniforms::u_opacity,
+    uniforms::u_texsize,
+    uniforms::u_pattern_tl_a,
+    uniforms::u_pattern_br_a,
+    uniforms::u_pattern_tl_b,
+    uniforms::u_pattern_br_b,
+    uniforms::u_pattern_size_a,
+    uniforms::u_pattern_size_b,
+    uniforms::u_scale_a,
+    uniforms::u_scale_b,
+    uniforms::u_mix,
+    uniforms::u_image,
+    uniforms::u_pixel_coord_upper,
+    uniforms::u_pixel_coord_lower,
+    uniforms::u_tile_units_to_pixels>
+{
+    static Values values(mat4 matrix,
+                         float opacity,
+                         Size atlasSize,
+                         const ImagePosition&,
+                         const ImagePosition&,
+                         const Faded<std::string>&,
+                         const UnwrappedTileID&,
+                         const TransformState&);
+};
+
+class BackgroundProgram : public Program<
+    shaders::background,
+    gl::Triangle,
+    BackgroundLayoutAttributes,
+    BackgroundUniforms,
+    style::Properties<>>
+{
+public:
+    using Program::Program;
+};
+
+class BackgroundPatternProgram : public Program<
+    shaders::background_pattern,
+    gl::Triangle,
+    BackgroundLayoutAttributes,
+    BackgroundPatternUniforms,
+    style::Properties<>>
+{
+public:
+    using Program::Program;
+};
+
+using BackgroundLayoutVertex = BackgroundProgram::LayoutVertex;
+using BackgroundAttributes = BackgroundProgram::Attributes;
+
+} // namespace mbgl
diff --git a/src/mbgl/programs/clipping_mask_program.hpp b/src/mbgl/programs/clipping_mask_program.hpp
new file mode 100644
index 0000000000..5dff4849fe
--- /dev/null
+++ b/src/mbgl/programs/clipping_mask_program.hpp
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <mbgl/programs/program.hpp>
+#include <mbgl/programs/attributes.hpp>
+#include <mbgl/programs/uniforms.hpp>
+#include <mbgl/shaders/clipping_mask.hpp>
+#include <mbgl/style/properties.hpp>
+
+namespace mbgl {
+
+class ClippingMaskProgram : public Program<
+    shaders::clipping_mask,
+    gl::Triangle,
+    PositionOnlyLayoutAttributes,
+    gl::Uniforms<
+        uniforms::u_matrix>,
+    style::Properties<>>
+{
+public:
+    using Program::Program;
+};
+
+using ClippingMaskLayoutVertex = ClippingMaskProgram::LayoutVertex;
+using ClippingMaskAttributes = ClippingMaskProgram::Attributes;
+
+} // namespace mbgl
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp
index 2dfeea3279..ac478250fc 100644
--- a/src/mbgl/programs/fill_program.hpp
+++ b/src/mbgl/programs/fill_program.hpp
@@ -21,9 +21,7 @@ class UnwrappedTileID;
 class TransformState;
 template <class> class Faded;
 
-struct FillLayoutAttributes : gl::Attributes<
-    attributes::a_pos>
-{};
+using FillLayoutAttributes = PositionOnlyLayoutAttributes;
 
 struct FillUniforms : gl::Uniforms<
     uniforms::u_matrix,
diff --git a/src/mbgl/programs/programs.hpp b/src/mbgl/programs/programs.hpp
index d769defaaf..a3891fafac 100644
--- a/src/mbgl/programs/programs.hpp
+++ b/src/mbgl/programs/programs.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <mbgl/programs/background_program.hpp>
 #include <mbgl/programs/circle_program.hpp>
+#include <mbgl/programs/clipping_mask_program.hpp>
 #include <mbgl/programs/extrusion_texture_program.hpp>
 #include <mbgl/programs/fill_program.hpp>
 #include <mbgl/programs/fill_extrusion_program.hpp>
@@ -16,7 +18,9 @@ namespace mbgl {
 class Programs {
 public:
     Programs(gl::Context& context, const ProgramParameters& programParameters)
-        : circle(context, programParameters),
+        : background(context, programParameters),
+          backgroundPattern(context, programParameters),
+          circle(context, programParameters),
           extrusionTexture(context, programParameters),
           fill(context, programParameters),
           fillExtrusion(context, programParameters),
@@ -33,9 +37,12 @@ public:
           symbolGlyph(context, programParameters),
           debug(context, programParameters),
           collisionBox(context, programParameters),
-          collisionCircle(context, programParameters) {
+          collisionCircle(context, programParameters),
+          clippingMask(context, programParameters) {
     }
 
+    BackgroundProgram background;
+    BackgroundPatternProgram backgroundPattern;
     ProgramMap<CircleProgram> circle;
     ExtrusionTextureProgram extrusionTexture;
     ProgramMap<FillProgram> fill;
@@ -55,6 +62,7 @@ public:
     DebugProgram debug;
     CollisionBoxProgram collisionBox;
     CollisionCircleProgram collisionCircle;
+    ClippingMaskProgram clippingMask;
 };
 
 } // namespace mbgl