3 files changed, 14 insertions, 20 deletions
diff --git a/src/mbgl/programs/attributes.hpp b/src/mbgl/programs/attributes.hpp
index 459de23f41..437ae2195c 100644
--- a/src/mbgl/programs/attributes.hpp
+++ b/src/mbgl/programs/attributes.hpp
@@ -31,6 +31,7 @@ MBGL_DEFINE_ATTRIBUTE(uint16_t, 2, a_texture_pos);
 MBGL_DEFINE_ATTRIBUTE(int16_t,  3, a_normal);
 MBGL_DEFINE_ATTRIBUTE(uint16_t, 1, a_edgedistance);
 MBGL_DEFINE_ATTRIBUTE(uint8_t, 1, a_fade_opacity);
+MBGL_DEFINE_ATTRIBUTE(uint8_t, 2, a_placed);                                        
 
 template <typename T, std::size_t N>
 struct a_data {
diff --git a/src/mbgl/programs/collision_box_program.cpp b/src/mbgl/programs/collision_box_program.cpp
index 57107db75d..babd4b2596 100644
--- a/src/mbgl/programs/collision_box_program.cpp
+++ b/src/mbgl/programs/collision_box_program.cpp
@@ -2,6 +2,6 @@
 
 namespace mbgl {
 
-static_assert(sizeof(CollisionBoxProgram::LayoutVertex) == 14, "expected CollisionBoxVertex size");
+static_assert(sizeof(CollisionBoxProgram::LayoutVertex) == 12, "expected CollisionBoxVertex size");
 
 } // namespace mbgl
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp
index ba99e0c087..d4b5ea0e5a 100644
--- a/src/mbgl/programs/collision_box_program.hpp
+++ b/src/mbgl/programs/collision_box_program.hpp
@@ -11,16 +11,18 @@
 
 namespace mbgl {
 
-namespace uniforms {
-MBGL_DEFINE_UNIFORM_SCALAR(float, u_scale);
-MBGL_DEFINE_UNIFORM_SCALAR(float, u_maxzoom);
-} // namespace uniforms
-
 using CollisionBoxAttributes = gl::Attributes<
     attributes::a_pos,
     attributes::a_anchor_pos,
-    attributes::a_extrude,
-    attributes::a_data<uint8_t, 2>>;
+    attributes::a_extrude>;
+
+struct CollisionBoxOpacityAttributes : gl::Attributes<attributes::a_placed> {
+    static Vertex vertex(bool placed, bool notUsed) {
+        return Vertex {
+            {{ static_cast<uint8_t>(placed), static_cast<uint8_t>(notUsed)  }}
+        };
+    }
+};
 
 class CollisionBoxProgram : public Program<
     shaders::collision_box,
@@ -28,19 +30,14 @@ class CollisionBoxProgram : public Program<
     CollisionBoxAttributes,
     gl::Uniforms<
         uniforms::u_matrix,
-        uniforms::u_scale,
-        uniforms::u_zoom,
-        uniforms::u_maxzoom,
-        uniforms::u_collision_y_stretch,
-        uniforms::u_camera_to_center_distance,
-        uniforms::u_pitch,
-        uniforms::u_fadetexture>,
+        uniforms::u_extrude_scale,
+        uniforms::u_camera_to_center_distance>,
     style::Properties<>>
 {
 public:
     using Program::Program;
 
-    static LayoutVertex vertex(Point<float> a, Point<float> anchor, Point<float> o, float maxzoom, float placementZoom) {
+    static LayoutVertex vertex(Point<float> a, Point<float> anchor, Point<float> o) {
         return LayoutVertex {
             {{
                 static_cast<int16_t>(a.x),
@@ -53,10 +50,6 @@ public:
             {{
                 static_cast<int16_t>(::round(o.x)),
                 static_cast<int16_t>(::round(o.y))
-            }},
-            {{
-                static_cast<uint8_t>(maxzoom * 10),
-                static_cast<uint8_t>(placementZoom * 10)
             }}
         };
     }