[core] remove a_/u_ prefix from attribute/uniform types

1 files changed, 15 insertions, 15 deletions

diff --git a/src/mbgl/programs/background_program.cpp b/src/mbgl/programs/background_program.cpp
index 7d68f62fb1..772d481578 100644
--- a/src/mbgl/programs/background_program.cpp
+++ b/src/mbgl/programs/background_program.cpp
@@ -28,21 +28,21 @@ BackgroundPatternProgram::layoutUniformValues(mat4 matrix,
     int32_t pixelY = tileSizeAtNearestZoom * tileID.canonical.y;
 
     return {
-        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_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::matrix::Value( matrix ),
+        uniforms::opacity::Value( opacity ),
+        uniforms::texsize::Value( atlasSize ),
+        uniforms::pattern_tl_a::Value( a.tl() ),
+        uniforms::pattern_br_a::Value( a.br() ),
+        uniforms::pattern_tl_b::Value( b.tl() ),
+        uniforms::pattern_br_b::Value( b.br() ),
+        uniforms::pattern_size_a::Value( a.displaySize() ),
+        uniforms::pattern_size_b::Value( b.displaySize() ),
+        uniforms::scale_a::Value( fading.fromScale ),
+        uniforms::scale_b::Value( fading.toScale ),
+        uniforms::mix::Value( fading.t ),
+        uniforms::pixel_coord_upper::Value( std::array<float, 2> {{ float(pixelX >> 16), float(pixelY >> 16) }}),
+        uniforms::pixel_coord_lower::Value( std::array<float, 2> {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF)}}),
+        uniforms::tile_units_to_pixels::Value( 1.0f / tileID.pixelsToTileUnits(1.0f, state.getIntegerZoom()) ),
     };
 }