[core] add place for specifying textures/samplers separately from uniforms

16 files changed, 28 insertions, 0 deletions

diff --git a/src/mbgl/programs/background_program.hpp b/src/mbgl/programs/background_program.hpp
index 0cf1b5e895..4f94ed16f4 100644
--- a/src/mbgl/programs/background_program.hpp
+++ b/src/mbgl/programs/background_program.hpp
@@ -49,6 +49,7 @@ class BackgroundProgram : public Program<
     gfx::Triangle,
     BackgroundLayoutAttributes,
     BackgroundUniforms,
+    TypeList<>,
     style::Properties<>>
 {
 public:
@@ -60,6 +61,7 @@ class BackgroundPatternProgram : public Program<
     gfx::Triangle,
     BackgroundLayoutAttributes,
     BackgroundPatternUniforms,
+    TypeList<>,
     style::Properties<>>
 {
 public:
diff --git a/src/mbgl/programs/circle_program.hpp b/src/mbgl/programs/circle_program.hpp
index c3a6e4c205..5a381d8fa9 100644
--- a/src/mbgl/programs/circle_program.hpp
+++ b/src/mbgl/programs/circle_program.hpp
@@ -24,6 +24,7 @@ class CircleProgram : public Program<
         uniforms::u_extrude_scale,
         uniforms::u_camera_to_center_distance,
         uniforms::u_pitch_with_map>,
+    TypeList<>,
     style::CirclePaintProperties>
 {
 public:
diff --git a/src/mbgl/programs/clipping_mask_program.hpp b/src/mbgl/programs/clipping_mask_program.hpp
index 4ce86cbf06..033d466116 100644
--- a/src/mbgl/programs/clipping_mask_program.hpp
+++ b/src/mbgl/programs/clipping_mask_program.hpp
@@ -14,6 +14,7 @@ class ClippingMaskProgram : public Program<
     PositionOnlyLayoutAttributes,
     TypeList<
         uniforms::u_matrix>,
+    TypeList<>,
     style::Properties<>>
 {
 public:
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp
index 9872636f65..e9b69c639b 100644
--- a/src/mbgl/programs/collision_box_program.hpp
+++ b/src/mbgl/programs/collision_box_program.hpp
@@ -28,6 +28,7 @@ class CollisionBoxProgram : public Program<
         uniforms::u_matrix,
         uniforms::u_extrude_scale,
         uniforms::u_camera_to_center_distance>,
+    TypeList<>,
     style::Properties<>>
 {
 public:
@@ -119,6 +120,7 @@ class CollisionCircleProgram : public Program<
         uniforms::u_extrude_scale,
         uniforms::u_overscale_factor,
         uniforms::u_camera_to_center_distance>,
+    TypeList<>,
     style::Properties<>>
 {
 public:
diff --git a/src/mbgl/programs/debug_program.hpp b/src/mbgl/programs/debug_program.hpp
index 2827f52d53..7fdfc84cc0 100644
--- a/src/mbgl/programs/debug_program.hpp
+++ b/src/mbgl/programs/debug_program.hpp
@@ -16,6 +16,7 @@ class DebugProgram : public Program<
     TypeList<
         uniforms::u_matrix,
         uniforms::u_color>,
+    TypeList<>,
     style::Properties<>>
 {
 public:
diff --git a/src/mbgl/programs/extrusion_texture_program.hpp b/src/mbgl/programs/extrusion_texture_program.hpp
index 606909f54e..ccbb0398cf 100644
--- a/src/mbgl/programs/extrusion_texture_program.hpp
+++ b/src/mbgl/programs/extrusion_texture_program.hpp
@@ -18,6 +18,7 @@ class ExtrusionTextureProgram : public Program<
         uniforms::u_world,
         uniforms::u_image,
         uniforms::u_opacity>,
+    TypeList<>,
     style::Properties<>> {
 public:
     using Program::Program;
diff --git a/src/mbgl/programs/fill_extrusion_program.hpp b/src/mbgl/programs/fill_extrusion_program.hpp
index 548fb15d55..83a2fd1f60 100644
--- a/src/mbgl/programs/fill_extrusion_program.hpp
+++ b/src/mbgl/programs/fill_extrusion_program.hpp
@@ -57,6 +57,7 @@ class FillExtrusionProgram : public Program<
     gfx::Triangle,
     FillExtrusionLayoutAttributes,
     FillExtrusionUniforms,
+    TypeList<>,
     style::FillExtrusionPaintProperties>
 {
 public:
@@ -93,6 +94,7 @@ class FillExtrusionPatternProgram : public Program<
     gfx::Triangle,
     FillExtrusionLayoutAttributes,
     FillExtrusionPatternUniforms,
+    TypeList<>,
     style::FillExtrusionPaintProperties>
 {
 public:
diff --git a/src/mbgl/programs/fill_program.hpp b/src/mbgl/programs/fill_program.hpp
index 863671bbb9..47d09912ad 100644
--- a/src/mbgl/programs/fill_program.hpp
+++ b/src/mbgl/programs/fill_program.hpp
@@ -42,6 +42,7 @@ class FillProgram : public Program<
     gfx::Triangle,
     FillLayoutAttributes,
     FillUniforms,
+    TypeList<>,
     style::FillPaintProperties>
 {
 public:
@@ -62,6 +63,7 @@ class FillPatternProgram : public Program<
     gfx::Triangle,
     FillLayoutAttributes,
     FillPatternUniforms,
+    TypeList<>,
     style::FillPaintProperties>
 {
 public:
@@ -81,6 +83,7 @@ class FillOutlineProgram : public Program<
     gfx::Line,
     FillLayoutAttributes,
     FillUniforms,
+    TypeList<>,
     style::FillPaintProperties>
 {
 public:
@@ -92,6 +95,7 @@ class FillOutlinePatternProgram : public Program<
     gfx::Line,
     FillLayoutAttributes,
     FillPatternUniforms,
+    TypeList<>,
     style::FillPaintProperties>
 {
 public:
diff --git a/src/mbgl/programs/heatmap_program.hpp b/src/mbgl/programs/heatmap_program.hpp
index 23021c7d5d..a90e9d4053 100644
--- a/src/mbgl/programs/heatmap_program.hpp
+++ b/src/mbgl/programs/heatmap_program.hpp
@@ -23,6 +23,7 @@ class HeatmapProgram : public Program<
         uniforms::u_intensity,
         uniforms::u_matrix,
         uniforms::heatmap::u_extrude_scale>,
+    TypeList<>,
     style::HeatmapPaintProperties>
 {
 public:
diff --git a/src/mbgl/programs/heatmap_texture_program.hpp b/src/mbgl/programs/heatmap_texture_program.hpp
index 6d07b2cfb9..e193c09180 100644
--- a/src/mbgl/programs/heatmap_texture_program.hpp
+++ b/src/mbgl/programs/heatmap_texture_program.hpp
@@ -23,6 +23,7 @@ class HeatmapTextureProgram : public Program<
         uniforms::u_image,
         uniforms::u_color_ramp,
         uniforms::u_opacity>,
+    TypeList<>,
     style::Properties<>> {
 public:
     using Program::Program;
diff --git a/src/mbgl/programs/hillshade_prepare_program.hpp b/src/mbgl/programs/hillshade_prepare_program.hpp
index 5265c83f4c..44c8ca92be 100644
--- a/src/mbgl/programs/hillshade_prepare_program.hpp
+++ b/src/mbgl/programs/hillshade_prepare_program.hpp
@@ -25,6 +25,7 @@ class HillshadePrepareProgram : public Program<
         uniforms::u_zoom,
         uniforms::u_maxzoom,
         uniforms::u_image>,
+    TypeList<>,
     style::Properties<>> {
 public:
     using Program::Program;
diff --git a/src/mbgl/programs/hillshade_program.hpp b/src/mbgl/programs/hillshade_program.hpp
index 8592f248e5..37b5024b76 100644
--- a/src/mbgl/programs/hillshade_program.hpp
+++ b/src/mbgl/programs/hillshade_program.hpp
@@ -32,6 +32,7 @@ class HillshadeProgram : public Program<
         uniforms::u_accent,
         uniforms::u_light,
         uniforms::u_latrange>,
+    TypeList<>,
     style::HillshadePaintProperties>{
 public:
     using Program::Program;
diff --git a/src/mbgl/programs/line_program.hpp b/src/mbgl/programs/line_program.hpp
index e35c11a29c..6f9eefbc67 100644
--- a/src/mbgl/programs/line_program.hpp
+++ b/src/mbgl/programs/line_program.hpp
@@ -41,6 +41,7 @@ class LineProgram : public Program<
         uniforms::u_matrix,
         uniforms::u_ratio,
         uniforms::u_gl_units_to_pixels>,
+    TypeList<>,
     RenderLinePaintProperties>
 {
 public:
@@ -109,6 +110,7 @@ class LinePatternProgram : public Program<
         uniforms::u_texsize,
         uniforms::u_fade,
         uniforms::u_image>,
+    TypeList<>,
     RenderLinePaintProperties>
 {
 public:
@@ -138,6 +140,7 @@ class LineSDFProgram : public Program<
         uniforms::u_mix,
         uniforms::u_sdfgamma,
         uniforms::u_image>,
+    TypeList<>,
     RenderLinePaintProperties>
 {
 public:
@@ -163,6 +166,7 @@ class LineGradientProgram : public Program<
         uniforms::u_ratio,
         uniforms::u_gl_units_to_pixels,
         uniforms::u_image>,
+    TypeList<>,
     RenderLinePaintProperties>
 {
 public:
diff --git a/src/mbgl/programs/program.hpp b/src/mbgl/programs/program.hpp
index a5736a44cc..5ae918926e 100644
--- a/src/mbgl/programs/program.hpp
+++ b/src/mbgl/programs/program.hpp
@@ -19,6 +19,7 @@ template <class Shaders,
           class Primitive,
           class LayoutAttributeList,
           class UniformList,
+          class TextureList,
           class PaintProps>
 class Program {
 public:
diff --git a/src/mbgl/programs/raster_program.hpp b/src/mbgl/programs/raster_program.hpp
index 90d444a2d4..618081ab12 100644
--- a/src/mbgl/programs/raster_program.hpp
+++ b/src/mbgl/programs/raster_program.hpp
@@ -43,6 +43,7 @@ class RasterProgram : public Program<
         uniforms::u_buffer_scale,
         uniforms::u_scale_parent,
         uniforms::u_tl_parent>,
+    TypeList<>,
     style::RasterPaintProperties>
 {
 public:
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
index 76c3057852..4dce66ad4a 100644
--- a/src/mbgl/programs/symbol_program.hpp
+++ b/src/mbgl/programs/symbol_program.hpp
@@ -244,6 +244,7 @@ template <class Shaders,
           class Primitive,
           class LayoutAttributeList,
           class UniformList,
+          class TextureList,
           class PaintProps>
 class SymbolProgram : public SymbolProgramBase {
 public:
@@ -357,6 +358,7 @@ class SymbolIconProgram : public SymbolProgram<
         uniforms::u_pitch_with_map,
         uniforms::u_rotate_symbol,
         uniforms::u_aspect_ratio>,
+    TypeList<>,
     style::IconPaintProperties>
 {
 public:
@@ -398,6 +400,7 @@ class SymbolSDFProgram : public SymbolProgram<
         uniforms::u_aspect_ratio,
         uniforms::u_gamma_scale,
         uniforms::u_is_halo>,
+    TypeList<>,
     PaintProperties>
 {
 public:
@@ -420,6 +423,7 @@ public:
             uniforms::u_aspect_ratio,
             uniforms::u_gamma_scale,
             uniforms::u_is_halo>,
+        TypeList<>,
         PaintProperties>;
 
     using UniformValues = typename BaseProgram::UniformValues;