[core] eliminate UniformValue class to satisfy compiler

21 files changed, 181 insertions, 187 deletions

diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp
index 7b6489f34e..f8eaf369a2 100644
--- a/src/mbgl/gl/uniform.hpp
+++ b/src/mbgl/gl/uniform.hpp
@@ -16,13 +16,6 @@ namespace gl {
 template <class T>
 void bindUniform(UniformLocation, const T&);
 
-template <class Tag, class T>
-class UniformValue {
-public:
-    explicit UniformValue(T t_) : t(std::move(t_)) {}
-    T t;
-};
-
 class ActiveUniform {
 public:
     std::size_t size;
@@ -42,7 +35,8 @@ ActiveUniforms activeUniforms(ProgramID);
 template <class Tag, class T>
 class Uniform {
 public:
-    using Value = UniformValue<Tag, T>;
+    // TODO should maybe remove this altogether bc it is now redundant?
+    using Value = T;
 
     using Type = T;
 
@@ -50,10 +44,10 @@ public:
     public:
         State(UniformLocation location_) : location(std::move(location_)) {}
 
-        void operator=(const Value& value) {
-            if (location >= 0 && (!current || *current != value.t)) {
-                current = value.t;
-                bindUniform(location, value.t);
+        void operator=(const Type& value) {
+            if (location >= 0 && (!current || *current != value)) {
+                current = value;
+                bindUniform(location, value);
             }
         }
 
diff --git a/src/mbgl/programs/background_program.cpp b/src/mbgl/programs/background_program.cpp
index 52a9638d6b..ae9c923c73 100644
--- a/src/mbgl/programs/background_program.cpp
+++ b/src/mbgl/programs/background_program.cpp
@@ -25,22 +25,22 @@ BackgroundPatternUniforms::values(mat4 matrix,
     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()) },
+        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()) ),
     };
 }
 
diff --git a/src/mbgl/programs/fill_extrusion_program.cpp b/src/mbgl/programs/fill_extrusion_program.cpp
index aaf192a843..1e11a254eb 100644
--- a/src/mbgl/programs/fill_extrusion_program.cpp
+++ b/src/mbgl/programs/fill_extrusion_program.cpp
@@ -36,10 +36,10 @@ FillExtrusionUniforms::values(mat4 matrix,
                               const TransformState& state,
                               const EvaluatedLight& light) {
     return FillExtrusionUniforms::Values{
-        uniforms::u_matrix::Value{ matrix },
-        uniforms::u_lightcolor::Value{ lightColor(light) },
-        uniforms::u_lightpos::Value{ lightPosition(light, state) },
-        uniforms::u_lightintensity::Value{ lightIntensity(light) }
+        uniforms::u_matrix::Value( matrix ),
+        uniforms::u_lightcolor::Value( lightColor(light) ),
+        uniforms::u_lightpos::Value( lightPosition(light, state) ),
+        uniforms::u_lightintensity::Value( lightIntensity(light) )
     };
 }
 
@@ -58,25 +58,25 @@ FillExtrusionPatternUniforms::values(mat4 matrix,
     int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
 
     return FillExtrusionPatternUniforms::Values{
-        uniforms::u_matrix::Value{ matrix },
-        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_texsize::Value{ atlasSize },
-        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()) },
-        uniforms::u_height_factor::Value{ heightFactor },
-        uniforms::u_lightcolor::Value{ lightColor(light) },
-        uniforms::u_lightpos::Value{ lightPosition(light, state) },
-        uniforms::u_lightintensity::Value{ lightIntensity(light) },
+        uniforms::u_matrix::Value( matrix ),
+        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_texsize::Value( atlasSize ),
+        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()) ),
+        uniforms::u_height_factor::Value( heightFactor ),
+        uniforms::u_lightcolor::Value( lightColor(light) ),
+        uniforms::u_lightpos::Value( lightPosition(light, state) ),
+        uniforms::u_lightintensity::Value( lightIntensity(light) ),
     };
 }
 
diff --git a/src/mbgl/programs/fill_program.cpp b/src/mbgl/programs/fill_program.cpp
index 46dc830102..e88ee26824 100644
--- a/src/mbgl/programs/fill_program.cpp
+++ b/src/mbgl/programs/fill_program.cpp
@@ -25,22 +25,22 @@ FillPatternUniforms::values(mat4 matrix,
     int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
 
     return FillPatternUniforms::Values {
-        uniforms::u_matrix::Value{ matrix },
-        uniforms::u_world::Value{ framebufferSize },
-        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()) },
+        uniforms::u_matrix::Value( matrix ),
+        uniforms::u_world::Value( framebufferSize ),
+        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()) ),
     };
 }
 
diff --git a/src/mbgl/programs/line_program.cpp b/src/mbgl/programs/line_program.cpp
index 1771cf8b03..a5ba3a5c91 100644
--- a/src/mbgl/programs/line_program.cpp
+++ b/src/mbgl/programs/line_program.cpp
@@ -20,13 +20,13 @@ Values makeValues(const RenderLinePaintProperties::PossiblyEvaluated& properties
                   Args&&... args) {
 
     return Values {
-        uniforms::u_matrix::Value{
+        uniforms::u_matrix::Value(
             tile.translatedMatrix(properties.get<LineTranslate>(),
                                   properties.get<LineTranslateAnchor>(),
                                   state)
-        },
-        uniforms::u_ratio::Value{ 1.0f / tile.id.pixelsToTileUnits(1.0, state.getZoom()) },
-        uniforms::u_gl_units_to_pixels::Value{{{ 1.0f / pixelsToGLUnits[0], 1.0f / pixelsToGLUnits[1] }}},
+        ),
+        uniforms::u_ratio::Value( 1.0f / tile.id.pixelsToTileUnits(1.0, state.getZoom()) ),
+        uniforms::u_gl_units_to_pixels::Value({ {1.0f / pixelsToGLUnits[0], 1.0f / pixelsToGLUnits[1]} }),
         std::forward<Args>(args)...
     };
 }
@@ -71,13 +71,13 @@ LineSDFProgram::uniformValues(const RenderLinePaintProperties::PossiblyEvaluated
         tile,
         state,
         pixelsToGLUnits,
-        uniforms::u_patternscale_a::Value{ scaleA },
-        uniforms::u_patternscale_b::Value{ scaleB },
-        uniforms::u_tex_y_a::Value{ posA.y },
-        uniforms::u_tex_y_b::Value{ posB.y },
-        uniforms::u_mix::Value{ properties.get<LineDasharray>().t },
-        uniforms::u_sdfgamma::Value{ atlasWidth / (std::min(widthA, widthB) * 256.0f * pixelRatio) / 2.0f },
-        uniforms::u_image::Value{ 0 }
+        uniforms::u_patternscale_a::Value( scaleA ),
+        uniforms::u_patternscale_b::Value( scaleB ),
+        uniforms::u_tex_y_a::Value( posA.y ),
+        uniforms::u_tex_y_b::Value( posB.y ),
+        uniforms::u_mix::Value( properties.get<LineDasharray>().t ),
+        uniforms::u_sdfgamma::Value( atlasWidth / (std::min(widthA, widthB) * 256.0f * pixelRatio) / 2.0f ),
+        uniforms::u_image::Value( 0 )
     );
 }
 
@@ -97,10 +97,10 @@ LinePatternProgram::uniformValues(const RenderLinePaintProperties::PossiblyEvalu
         tile,
         state,
         pixelsToGLUnits,
-        uniforms::u_scale::Value{ {{ pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale}}  },
-        uniforms::u_texsize::Value{ atlasSize },
-        uniforms::u_fade::Value{ crossfade.t },
-        uniforms::u_image::Value{ 0 }
+        uniforms::u_scale::Value ({ {pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale} }),
+        uniforms::u_texsize::Value( atlasSize ),
+        uniforms::u_fade::Value( crossfade.t ),
+        uniforms::u_image::Value( 0 )
     );
 }
 
diff --git a/src/mbgl/programs/symbol_program.cpp b/src/mbgl/programs/symbol_program.cpp
index d73abd4fe1..0c195e4d37 100644
--- a/src/mbgl/programs/symbol_program.cpp
+++ b/src/mbgl/programs/symbol_program.cpp
@@ -77,25 +77,25 @@ Values makeValues(const bool isText,
     mat4 glCoordMatrix = getGlCoordMatrix(tile.matrix, pitchWithMap, rotateWithMap, state, pixelsToTileUnits);
 
     return Values {
-        uniforms::u_matrix::Value{ tile.translatedMatrix(values.translate,
+        uniforms::u_matrix::Value( tile.translatedMatrix(values.translate,
                                    values.translateAnchor,
-                                   state) },
-        uniforms::u_label_plane_matrix::Value{labelPlaneMatrix},
-        uniforms::u_gl_coord_matrix::Value{ tile.translateVtxMatrix(glCoordMatrix,
+                                   state) ),
+        uniforms::u_label_plane_matrix::Value(labelPlaneMatrix),
+        uniforms::u_gl_coord_matrix::Value( tile.translateVtxMatrix(glCoordMatrix,
                                             values.translate,
                                             values.translateAnchor,
                                             state,
-                                            true) },
-        uniforms::u_extrude_scale::Value{ extrudeScale },
-        uniforms::u_texsize::Value{ texsize },
-        uniforms::u_texture::Value{ 0 },
-        uniforms::u_fade_change::Value{ symbolFadeChange },
-        uniforms::u_is_text::Value{ isText },
-        uniforms::u_camera_to_center_distance::Value{ state.getCameraToCenterDistance() },
-        uniforms::u_pitch::Value{ state.getPitch() },
-        uniforms::u_pitch_with_map::Value{ pitchWithMap },
-        uniforms::u_rotate_symbol::Value{ rotateInShader },
-        uniforms::u_aspect_ratio::Value{ state.getSize().aspectRatio() },
+                                            true) ),
+        uniforms::u_extrude_scale::Value( extrudeScale ),
+        uniforms::u_texsize::Value( texsize ),
+        uniforms::u_texture::Value( 0 ),
+        uniforms::u_fade_change::Value( symbolFadeChange ),
+        uniforms::u_is_text::Value( isText ),
+        uniforms::u_camera_to_center_distance::Value( state.getCameraToCenterDistance() ),
+        uniforms::u_pitch::Value( state.getPitch() ),
+        uniforms::u_pitch_with_map::Value( pitchWithMap ),
+        uniforms::u_rotate_symbol::Value( rotateInShader ),
+        uniforms::u_aspect_ratio::Value( state.getSize().aspectRatio() ),
         std::forward<Args>(args)...
     };
 }
@@ -147,8 +147,8 @@ typename SymbolSDFProgram<PaintProperties>::UniformValues SymbolSDFProgram<Paint
         tile,
         state,
         symbolFadeChange,
-        uniforms::u_gamma_scale::Value{ gammaScale },
-        uniforms::u_is_halo::Value{ part == SymbolSDFPart::Halo }
+        uniforms::u_gamma_scale::Value( gammaScale ),
+        uniforms::u_is_halo::Value( part == SymbolSDFPart::Halo )
     );
 }
 
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
index 27bcd7b427..6d22e812fa 100644
--- a/src/mbgl/programs/symbol_program.hpp
+++ b/src/mbgl/programs/symbol_program.hpp
@@ -125,10 +125,10 @@ public:
     UniformValues uniformValues(float currentZoom) const {
         const ZoomEvaluatedSize u = evaluateForZoom(currentZoom);
         return UniformValues {
-            uniforms::u_is_size_zoom_constant::Value{ u.isZoomConstant },
-            uniforms::u_is_size_feature_constant::Value{ u.isFeatureConstant},
-            uniforms::u_size_t::Value{ u.sizeT },
-            uniforms::u_size::Value{ u.size }
+            uniforms::u_is_size_zoom_constant::Value( u.isZoomConstant ),
+            uniforms::u_is_size_feature_constant::Value( u.isFeatureConstant),
+            uniforms::u_size_t::Value( u.sizeT ),
+            uniforms::u_size::Value( u.size )
         };
     }
 };
diff --git a/src/mbgl/renderer/layers/render_background_layer.cpp b/src/mbgl/renderer/layers/render_background_layer.cpp
index 2dc5fe7339..602c589b09 100644
--- a/src/mbgl/renderer/layers/render_background_layer.cpp
+++ b/src/mbgl/renderer/layers/render_background_layer.cpp
@@ -108,9 +108,9 @@ void RenderBackgroundLayer::render(PaintParameters& parameters, RenderSource*) {
             draw(
                 parameters.programs.background,
                 BackgroundProgram::UniformValues {
-                    uniforms::u_matrix::Value{ parameters.matrixForTile(tileID) },
-                    uniforms::u_color::Value{ evaluated.get<BackgroundColor>() },
-                    uniforms::u_opacity::Value{ evaluated.get<BackgroundOpacity>() },
+                    uniforms::u_matrix::Value( parameters.matrixForTile(tileID) ),
+                    uniforms::u_color::Value( evaluated.get<BackgroundColor>() ),
+                    uniforms::u_opacity::Value( evaluated.get<BackgroundOpacity>() ),
                 }
             );
         }
diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp
index ce63ada770..dacce35d75 100644
--- a/src/mbgl/renderer/layers/render_circle_layer.cpp
+++ b/src/mbgl/renderer/layers/render_circle_layer.cpp
@@ -68,19 +68,19 @@ void RenderCircleLayer::render(PaintParameters& parameters, RenderSource*) {
    
         const auto allUniformValues = programInstance.computeAllUniformValues(
             CircleProgram::UniformValues {
-                uniforms::u_matrix::Value{
+                uniforms::u_matrix::Value(
                     tile.translatedMatrix(evaluated.get<CircleTranslate>(),
                                           evaluated.get<CircleTranslateAnchor>(),
                                           parameters.state)
-                },
-                uniforms::u_scale_with_map::Value{ scaleWithMap },
-                uniforms::u_extrude_scale::Value{ pitchWithMap
+                ),
+                uniforms::u_scale_with_map::Value( scaleWithMap ),
+                uniforms::u_extrude_scale::Value( pitchWithMap
                     ? std::array<float, 2> {{
                         tile.id.pixelsToTileUnits(1, parameters.state.getZoom()),
                         tile.id.pixelsToTileUnits(1, parameters.state.getZoom()) }}
-                    : parameters.pixelsToGLUnits },
-                uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() },
-                uniforms::u_pitch_with_map::Value{ pitchWithMap }
+                    : parameters.pixelsToGLUnits ),
+                uniforms::u_camera_to_center_distance::Value( parameters.state.getCameraToCenterDistance() ),
+                uniforms::u_pitch_with_map::Value( pitchWithMap )
             },
             paintPropertyBinders,
             evaluated,
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
index 2f720284fc..cf9d02301a 100644
--- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp
@@ -168,9 +168,9 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource*
 
         const auto allUniformValues = programInstance.computeAllUniformValues(
             ExtrusionTextureProgram::UniformValues{
-                uniforms::u_matrix::Value{ viewportMat }, uniforms::u_world::Value{ size },
-                uniforms::u_image::Value{ 0 },
-                uniforms::u_opacity::Value{ evaluated.get<FillExtrusionOpacity>() }
+                uniforms::u_matrix::Value( viewportMat ), uniforms::u_world::Value( size ),
+                uniforms::u_image::Value( 0 ),
+                uniforms::u_opacity::Value( evaluated.get<FillExtrusionOpacity>() )
             },
             paintAttributeData,
             properties,
diff --git a/src/mbgl/renderer/layers/render_fill_layer.cpp b/src/mbgl/renderer/layers/render_fill_layer.cpp
index f03eb66c88..1e46a49d3d 100644
--- a/src/mbgl/renderer/layers/render_fill_layer.cpp
+++ b/src/mbgl/renderer/layers/render_fill_layer.cpp
@@ -78,12 +78,12 @@ void RenderFillLayer::render(PaintParameters& parameters, RenderSource*) {
 
                 const auto allUniformValues = programInstance.computeAllUniformValues(
                     FillProgram::UniformValues {
-                        uniforms::u_matrix::Value{
+                        uniforms::u_matrix::Value(
                             tile.translatedMatrix(evaluated.get<FillTranslate>(),
                                                   evaluated.get<FillTranslateAnchor>(),
                                                   parameters.state)
-                        },
-                        uniforms::u_world::Value{ parameters.context.viewport.getCurrentValue().size },
+                        ),
+                        uniforms::u_world::Value( parameters.context.viewport.getCurrentValue().size ),
                     },
                     paintPropertyBinders,
                     evaluated,
diff --git a/src/mbgl/renderer/layers/render_heatmap_layer.cpp b/src/mbgl/renderer/layers/render_heatmap_layer.cpp
index c9ca477cbb..9801ea5950 100644
--- a/src/mbgl/renderer/layers/render_heatmap_layer.cpp
+++ b/src/mbgl/renderer/layers/render_heatmap_layer.cpp
@@ -101,9 +101,9 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) {
        
             const auto allUniformValues = programInstance.computeAllUniformValues(
                 HeatmapProgram::UniformValues {
-                    uniforms::u_intensity::Value{ evaluated.get<style::HeatmapIntensity>() },
-                    uniforms::u_matrix::Value{ tile.matrix },
-                    uniforms::heatmap::u_extrude_scale::Value{ extrudeScale }
+                    uniforms::u_intensity::Value( evaluated.get<style::HeatmapIntensity>() ),
+                    uniforms::u_matrix::Value( tile.matrix ),
+                    uniforms::heatmap::u_extrude_scale::Value( extrudeScale )
                 },
                 paintPropertyBinders,
                 evaluated,
@@ -147,10 +147,10 @@ void RenderHeatmapLayer::render(PaintParameters& parameters, RenderSource*) {
 
         const auto allUniformValues = programInstance.computeAllUniformValues(
             HeatmapTextureProgram::UniformValues{
-                uniforms::u_matrix::Value{ viewportMat }, uniforms::u_world::Value{ size },
-                uniforms::u_image::Value{ 0 },
-                uniforms::u_color_ramp::Value{ 1 },
-                uniforms::u_opacity::Value{ evaluated.get<HeatmapOpacity>() }
+                uniforms::u_matrix::Value( viewportMat ), uniforms::u_world::Value( size ),
+                uniforms::u_image::Value( 0 ),
+                uniforms::u_color_ramp::Value( 1 ),
+                uniforms::u_opacity::Value( evaluated.get<HeatmapOpacity>() )
             },
             paintAttributeData,
             properties,
diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp
index 8bcd3f1837..781f1af47c 100644
--- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp
+++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp
@@ -75,13 +75,13 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src
 
         const auto allUniformValues = programInstance.computeAllUniformValues(
             HillshadeProgram::UniformValues {
-                uniforms::u_matrix::Value{ matrix },
-                uniforms::u_image::Value{ 0 },
-                uniforms::u_highlight::Value{ evaluated.get<HillshadeHighlightColor>() },
-                uniforms::u_shadow::Value{ evaluated.get<HillshadeShadowColor>() },
-                uniforms::u_accent::Value{ evaluated.get<HillshadeAccentColor>() },
-                uniforms::u_light::Value{ getLight(parameters) },
-                uniforms::u_latrange::Value{ getLatRange(id) },
+                uniforms::u_matrix::Value( matrix ),
+                uniforms::u_image::Value( 0 ),
+                uniforms::u_highlight::Value( evaluated.get<HillshadeHighlightColor>() ),
+                uniforms::u_shadow::Value( evaluated.get<HillshadeShadowColor>() ),
+                uniforms::u_accent::Value( evaluated.get<HillshadeAccentColor>() ),
+                uniforms::u_light::Value( getLight(parameters) ),
+                uniforms::u_latrange::Value( getLatRange(id) ),
             },
             paintAttributeData,
             evaluated,
@@ -137,11 +137,11 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src
 
             const auto allUniformValues = programInstance.computeAllUniformValues(
                 HillshadePrepareProgram::UniformValues {
-                    uniforms::u_matrix::Value { mat },
-                    uniforms::u_dimension::Value { {{uint16_t(tilesize * 2), uint16_t(tilesize * 2) }} },
-                    uniforms::u_zoom::Value{ float(tile.id.canonical.z) },
-                    uniforms::u_maxzoom::Value{ float(maxzoom) },
-                    uniforms::u_image::Value{ 0 }
+                    uniforms::u_matrix::Value( mat ),
+                    uniforms::u_dimension::Value( {{uint16_t(tilesize * 2), uint16_t(tilesize * 2)}} ),
+                    uniforms::u_zoom::Value( float(tile.id.canonical.z) ),
+                    uniforms::u_maxzoom::Value( float(maxzoom) ),
+                    uniforms::u_image::Value( 0 )
                 },
                 paintAttributeData,
                 properties,
diff --git a/src/mbgl/renderer/layers/render_raster_layer.cpp b/src/mbgl/renderer/layers/render_raster_layer.cpp
index e2524697b5..3179a88207 100644
--- a/src/mbgl/renderer/layers/render_raster_layer.cpp
+++ b/src/mbgl/renderer/layers/render_raster_layer.cpp
@@ -83,19 +83,19 @@ void RenderRasterLayer::render(PaintParameters& parameters, RenderSource* source
 
         const auto allUniformValues = programInstance.computeAllUniformValues(
             RasterProgram::UniformValues {
-                uniforms::u_matrix::Value{ matrix },
-                uniforms::u_image0::Value{ 0 },
-                uniforms::u_image1::Value{ 1 },
-                uniforms::u_opacity::Value{ evaluated.get<RasterOpacity>() },
-                uniforms::u_fade_t::Value{ 1 },
-                uniforms::u_brightness_low::Value{ evaluated.get<RasterBrightnessMin>() },
-                uniforms::u_brightness_high::Value{ evaluated.get<RasterBrightnessMax>() },
-                uniforms::u_saturation_factor::Value{ saturationFactor(evaluated.get<RasterSaturation>()) },
-                uniforms::u_contrast_factor::Value{ contrastFactor(evaluated.get<RasterContrast>()) },
-                uniforms::u_spin_weights::Value{ spinWeights(evaluated.get<RasterHueRotate>()) },
-                uniforms::u_buffer_scale::Value{ 1.0f },
-                uniforms::u_scale_parent::Value{ 1.0f },
-                uniforms::u_tl_parent::Value{ std::array<float, 2> {{ 0.0f, 0.0f }} },
+                uniforms::u_matrix::Value( matrix ),
+                uniforms::u_image0::Value( 0 ),
+                uniforms::u_image1::Value( 1 ),
+                uniforms::u_opacity::Value( evaluated.get<RasterOpacity>() ),
+                uniforms::u_fade_t::Value( 1 ),
+                uniforms::u_brightness_low::Value( evaluated.get<RasterBrightnessMin>() ),
+                uniforms::u_brightness_high::Value( evaluated.get<RasterBrightnessMax>() ),
+                uniforms::u_saturation_factor::Value( saturationFactor(evaluated.get<RasterSaturation>()) ),
+                uniforms::u_contrast_factor::Value( contrastFactor(evaluated.get<RasterContrast>()) ),
+                uniforms::u_spin_weights::Value( spinWeights(evaluated.get<RasterHueRotate>()) ),
+                uniforms::u_buffer_scale::Value( 1.0f ),
+                uniforms::u_scale_parent::Value( 1.0f ),
+                uniforms::u_tl_parent::Value( std::array<float, 2> {{ 0.0f, 0.0f }} ),
             },
             paintAttributeData,
             evaluated,
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp
index f9e4e7c043..1eb8c83bf6 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp
@@ -251,9 +251,9 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) {
                 gl::StencilMode::disabled(),
                 parameters.colorModeForRenderPass(),
                 CollisionBoxProgram::UniformValues {
-                    uniforms::u_matrix::Value{ tile.matrix },
-                    uniforms::u_extrude_scale::Value{ extrudeScale },
-                    uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() }
+                    uniforms::u_matrix::Value( tile.matrix ),
+                    uniforms::u_extrude_scale::Value( extrudeScale ),
+                    uniforms::u_camera_to_center_distance::Value( parameters.state.getCameraToCenterDistance() )
                 },
                 *bucket.collisionBox.vertexBuffer,
                 *bucket.collisionBox.dynamicVertexBuffer,
@@ -285,10 +285,10 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) {
                 gl::StencilMode::disabled(),
                 parameters.colorModeForRenderPass(),
                 CollisionCircleProgram::UniformValues {
-                    uniforms::u_matrix::Value{ tile.matrix },
-                    uniforms::u_extrude_scale::Value{ extrudeScale },
-                    uniforms::u_overscale_factor::Value{ float(tile.tile.id.overscaleFactor()) },
-                    uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() }
+                    uniforms::u_matrix::Value( tile.matrix ),
+                    uniforms::u_extrude_scale::Value( extrudeScale ),
+                    uniforms::u_overscale_factor::Value( float(tile.tile.id.overscaleFactor()) ),
+                    uniforms::u_camera_to_center_distance::Value( parameters.state.getCameraToCenterDistance() )
                 },
                 *bucket.collisionCircle.vertexBuffer,
                 *bucket.collisionCircle.dynamicVertexBuffer,
diff --git a/src/mbgl/renderer/render_tile.cpp b/src/mbgl/renderer/render_tile.cpp
index 64790938ef..fcd8b77771 100644
--- a/src/mbgl/renderer/render_tile.cpp
+++ b/src/mbgl/renderer/render_tile.cpp
@@ -103,8 +103,8 @@ void RenderTile::finishRender(PaintParameters& parameters) {
             tile.debugBucket->segments,
             program.computeAllUniformValues(
                 DebugProgram::UniformValues {
-                    uniforms::u_matrix::Value{ matrix },
-                    uniforms::u_color::Value{ Color::white() }
+                    uniforms::u_matrix::Value( matrix ),
+                    uniforms::u_color::Value( Color::white() )
                 },
                 paintAttributeData,
                 properties,
@@ -124,8 +124,8 @@ void RenderTile::finishRender(PaintParameters& parameters) {
             tile.debugBucket->segments,
             program.computeAllUniformValues(
                 DebugProgram::UniformValues {
-                    uniforms::u_matrix::Value{ matrix },
-                    uniforms::u_color::Value{ Color::black() }
+                    uniforms::u_matrix::Value( matrix ),
+                    uniforms::u_color::Value( Color::black() )
                 },
                 paintAttributeData,
                 properties,
@@ -147,8 +147,8 @@ void RenderTile::finishRender(PaintParameters& parameters) {
             parameters.staticData.tileBorderSegments,
             program.computeAllUniformValues(
                 DebugProgram::UniformValues {
-                    uniforms::u_matrix::Value{ matrix },
-                    uniforms::u_color::Value{ Color::red() }
+                    uniforms::u_matrix::Value( matrix ),
+                    uniforms::u_color::Value( Color::red() )
                 },
                 paintAttributeData,
                 properties,
diff --git a/src/mbgl/renderer/renderer_impl.cpp b/src/mbgl/renderer/renderer_impl.cpp
index bc39c40796..4e636b5c7e 100644
--- a/src/mbgl/renderer/renderer_impl.cpp
+++ b/src/mbgl/renderer/renderer_impl.cpp
@@ -512,7 +512,7 @@ void Renderer::Impl::render(const UpdateParameters& updateParameters) {
                 parameters.staticData.tileTriangleSegments,
                 program.computeAllUniformValues(
                     ClippingMaskProgram::UniformValues {
-                        uniforms::u_matrix::Value{ parameters.matrixForTile(clipID.first) },
+                        uniforms::u_matrix::Value( parameters.matrixForTile(clipID.first) ),
                     },
                     paintAttributeData,
                     properties,
diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp
index 2ce046a7a0..d4577e787a 100644
--- a/src/mbgl/renderer/sources/render_image_source.cpp
+++ b/src/mbgl/renderer/sources/render_image_source.cpp
@@ -71,8 +71,8 @@ void RenderImageSource::finishRender(PaintParameters& parameters) {
             parameters.staticData.tileBorderSegments,
             programInstance.computeAllUniformValues(
                 DebugProgram::UniformValues {
-                    uniforms::u_matrix::Value{ matrix },
-                    uniforms::u_color::Value{ Color::red() }
+                    uniforms::u_matrix::Value( matrix ),
+                    uniforms::u_color::Value( Color::red() )
                 },
                 paintAttributeData,
                 properties,
diff --git a/src/mbgl/tile/geometry_tile.cpp b/src/mbgl/tile/geometry_tile.cpp
index 22d35f26e9..9743cd3f7d 100644
--- a/src/mbgl/tile/geometry_tile.cpp
+++ b/src/mbgl/tile/geometry_tile.cpp
@@ -168,8 +168,8 @@ void GeometryTile::getImages(ImageRequestPair pair) {
     imageManager.getImages(*this, std::move(pair));
 }
 
-const optional<ImagePosition> GeometryTile::getPattern(const std::string& id) {
-    auto it = iconAtlas.patternPositions.find(id);
+const optional<ImagePosition> GeometryTile::getPattern(const std::string& pattern) {
+    auto it = iconAtlas.patternPositions.find(pattern);
     if (it !=  iconAtlas.patternPositions.end()) {
         return it->second;
     }
diff --git a/src/mbgl/tile/geometry_tile.hpp b/src/mbgl/tile/geometry_tile.hpp
index 2733fa6dd3..3d0ca03a82 100644
--- a/src/mbgl/tile/geometry_tile.hpp
+++ b/src/mbgl/tile/geometry_tile.hpp
@@ -88,7 +88,7 @@ public:
     void markRenderedIdeal() override;
     void markRenderedPreviously() override;
     void performedFadePlacement() override;
-    const optional<ImagePosition> getPattern(const std::string& id);
+    const optional<ImagePosition> getPattern(const std::string& pattern);
     const std::shared_ptr<FeatureIndex> getFeatureIndex() const { return latestFeatureIndex; }
     
 protected:
diff --git a/test/programs/symbol_program.test.cpp b/test/programs/symbol_program.test.cpp
index b2467d5998..4d30e5dc3d 100644
--- a/test/programs/symbol_program.test.cpp
+++ b/test/programs/symbol_program.test.cpp
@@ -9,9 +9,9 @@ using namespace mbgl::style::expression::dsl;
 TEST(SymbolProgram, SymbolSizeBinder) {
     auto binder = SymbolSizeBinder::create(5.0f, 12.0f, 0.0f);
     auto uniformValues = binder->uniformValues(5.5f);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, true);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
-    EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 12.0f);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), true);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true);
+    EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 12.0f);
 
     binder = SymbolSizeBinder::create(1.0f, style::PropertyExpression<float>(
         interpolate(
@@ -20,9 +20,9 @@ TEST(SymbolProgram, SymbolSizeBinder) {
             0., literal(8.),
             10., literal(18.))), 0.0f);
     uniformValues = binder->uniformValues(1.5f);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
-    EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 9.5f);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), false);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true);
+    EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 9.5f);
     
     binder = SymbolSizeBinder::create(0.0f, style::PropertyExpression<float>(
         interpolate(
@@ -31,9 +31,9 @@ TEST(SymbolProgram, SymbolSizeBinder) {
             1., literal(8.),
             11., literal(18.))), 0.0f);
     uniformValues = binder->uniformValues(0.5f);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
-    EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 8.0f);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), false);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true);
+    EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 8.0f);
     
     binder = SymbolSizeBinder::create(12.0f, style::PropertyExpression<float>(
         interpolate(
@@ -42,9 +42,9 @@ TEST(SymbolProgram, SymbolSizeBinder) {
             1., literal(8.),
             11., literal(18.))), 0.0f);
     uniformValues = binder->uniformValues(12.5f);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, true);
-    EXPECT_EQ(uniformValues.get<uniforms::u_size>().t, 18.0f);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), false);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), true);
+    EXPECT_EQ(uniformValues.get<uniforms::u_size>(), 18.0f);
     
     binder = SymbolSizeBinder::create(0.0f, style::PropertyExpression<float>(
         interpolate(
@@ -53,8 +53,8 @@ TEST(SymbolProgram, SymbolSizeBinder) {
             1., literal(8.),
             11., literal(18.))), 0.0f);
     uniformValues = binder->uniformValues(12.5f);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, true);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, false);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), true);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), false);
 
     binder = SymbolSizeBinder::create(5.0f, style::PropertyExpression<float>(
         interpolate(
@@ -63,7 +63,7 @@ TEST(SymbolProgram, SymbolSizeBinder) {
             1., interpolate(linear(), number(get("x")), 0., literal(8.), 100., literal(18.)),
             11., interpolate(linear(), number(get("x")), 0., literal(12.), 100., literal(24.9)))), 0.0f);
     uniformValues = binder->uniformValues(5.5f);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>().t, false);
-    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>().t, false);
-    EXPECT_EQ(uniformValues.get<uniforms::u_size_t>().t, 0.45f);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_zoom_constant>(), false);
+    EXPECT_EQ(uniformValues.get<uniforms::u_is_size_feature_constant>(), false);
+    EXPECT_EQ(uniformValues.get<uniforms::u_size_t>(), 0.45f);
 }