Merge pull request #1 from mapbox/masterupstream/friedbunny-external-pr-14135

Merge Master

1 files changed, 8 insertions, 8 deletions

diff --git a/src/mbgl/programs/circle_program.hpp b/src/mbgl/programs/circle_program.hpp
index 0caa1b2a15..2b218d1768 100644
--- a/src/mbgl/programs/circle_program.hpp
+++ b/src/mbgl/programs/circle_program.hpp
@@ -9,20 +9,20 @@
 namespace mbgl {
 
 namespace uniforms {
-MBGL_DEFINE_UNIFORM_SCALAR(bool, u_scale_with_map);
+MBGL_DEFINE_UNIFORM_SCALAR(bool, scale_with_map);
 } // namespace uniforms
 
 class CircleProgram : public Program<
     CircleProgram,
     gfx::PrimitiveType::Triangle,
     TypeList<
-        attributes::a_pos>,
+        attributes::pos>,
     TypeList<
-        uniforms::u_matrix,
-        uniforms::u_scale_with_map,
-        uniforms::u_extrude_scale,
-        uniforms::u_camera_to_center_distance,
-        uniforms::u_pitch_with_map>,
+        uniforms::matrix,
+        uniforms::scale_with_map,
+        uniforms::extrude_scale,
+        uniforms::camera_to_center_distance,
+        uniforms::pitch_with_map>,
     TypeList<>,
     style::CirclePaintProperties>
 {
@@ -52,7 +52,7 @@ class CircleLayerPrograms final : public LayerTypePrograms  {
 public:
     CircleLayerPrograms(gfx::Context& context, const ProgramParameters& programParameters)
         : circle(context, programParameters) {}
-    ProgramMap<CircleProgram> circle;
+    CircleProgram circle;
 };
 
 } // namespace mbgl