use the values in the collisionbox opacity buffer [skip ci]upstream/start-collision-debug

4 files changed, 54 insertions, 9 deletions

diff --git a/src/mbgl/programs/collision_box_program.cpp b/src/mbgl/programs/collision_box_program.cpp
index babd4b2596..57107db75d 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) == 12, "expected CollisionBoxVertex size");
+static_assert(sizeof(CollisionBoxProgram::LayoutVertex) == 14, "expected CollisionBoxVertex size");
 
 } // namespace mbgl
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp
index d4b5ea0e5a..2547da9f18 100644
--- a/src/mbgl/programs/collision_box_program.hpp
+++ b/src/mbgl/programs/collision_box_program.hpp
@@ -11,7 +11,7 @@
 
 namespace mbgl {
 
-using CollisionBoxAttributes = gl::Attributes<
+using CollisionBoxLayoutAttributes = gl::Attributes<
     attributes::a_pos,
     attributes::a_anchor_pos,
     attributes::a_extrude>;
@@ -27,7 +27,7 @@ struct CollisionBoxOpacityAttributes : gl::Attributes<attributes::a_placed> {
 class CollisionBoxProgram : public Program<
     shaders::collision_box,
     gl::Line,
-    CollisionBoxAttributes,
+    gl::ConcatenateAttributes<CollisionBoxLayoutAttributes, CollisionBoxOpacityAttributes>,
     gl::Uniforms<
         uniforms::u_matrix,
         uniforms::u_extrude_scale,
@@ -37,8 +37,8 @@ class CollisionBoxProgram : public Program<
 public:
     using Program::Program;
 
-    static LayoutVertex vertex(Point<float> a, Point<float> anchor, Point<float> o) {
-        return LayoutVertex {
+    static CollisionBoxLayoutAttributes::Vertex vertex(Point<float> a, Point<float> anchor, Point<float> o) {
+        return CollisionBoxLayoutAttributes::Vertex {
             {{
                 static_cast<int16_t>(a.x),
                 static_cast<int16_t>(a.y)
@@ -53,6 +53,51 @@ public:
             }}
         };
     }
+
+	template <class DrawMode>
+		void draw(gl::Context& context,
+				DrawMode drawMode,
+				gl::DepthMode depthMode,
+				gl::StencilMode stencilMode,
+				gl::ColorMode colorMode,
+				const UniformValues& uniformValues,
+				const gl::VertexBuffer<CollisionBoxLayoutAttributes::Vertex>& layoutVertexBuffer,
+                const gl::VertexBuffer<CollisionBoxOpacityAttributes::Vertex>& opacityVertexBuffer,
+				const gl::IndexBuffer<DrawMode>& indexBuffer,
+				const SegmentVector<Attributes>& segments,
+				const PaintPropertyBinders& paintPropertyBinders,
+				const typename PaintProperties::PossiblyEvaluated& currentProperties,
+				float currentZoom,
+				const std::string& layerID) {
+			typename AllUniforms::Values allUniformValues = uniformValues
+				.concat(paintPropertyBinders.uniformValues(currentZoom, currentProperties));
+
+			typename Attributes::Bindings allAttributeBindings = CollisionBoxLayoutAttributes::bindings(layoutVertexBuffer)
+                .concat(CollisionBoxOpacityAttributes::bindings(opacityVertexBuffer))
+				.concat(paintPropertyBinders.attributeBindings(currentProperties));
+
+			for (auto& segment : segments) {
+				auto vertexArrayIt = segment.vertexArrays.find(layerID);
+
+				if (vertexArrayIt == segment.vertexArrays.end()) {
+					vertexArrayIt = segment.vertexArrays.emplace(layerID, context.createVertexArray()).first;
+				}
+
+				program.draw(
+						context,
+						std::move(drawMode),
+						std::move(depthMode),
+						std::move(stencilMode),
+						std::move(colorMode),
+						allUniformValues,
+						vertexArrayIt->second,
+						Attributes::offsetBindings(allAttributeBindings, segment.vertexOffset),
+						indexBuffer,
+						segment.indexOffset,
+						segment.indexLength);
+			}
+		}
+
 };
 
 using CollisionBoxVertex = CollisionBoxProgram::LayoutVertex;
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp
index 005a5faacf..86de194ee9 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.hpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp
@@ -103,13 +103,12 @@ public:
     } icon;
 
     struct CollisionBoxBuffer {
-        gl::VertexVector<CollisionBoxVertex> vertices;
+        gl::VertexVector<CollisionBoxLayoutAttributes::Vertex> vertices;
         gl::VertexVector<CollisionBoxOpacityAttributes::Vertex> opacityVertices;
         gl::IndexVector<gl::Lines> lines;
-        SegmentVector<CollisionBoxAttributes> segments;
+        SegmentVector<CollisionBoxProgram::Attributes> segments;
 
-        optional<gl::VertexBuffer<CollisionBoxVertex>> vertexBuffer;
-        optional<gl::VertexBuffer<SymbolDynamicLayoutAttributes::Vertex>> dynamicVertexBuffer;
+        optional<gl::VertexBuffer<CollisionBoxLayoutAttributes::Vertex>> vertexBuffer;
         optional<gl::VertexBuffer<CollisionBoxOpacityAttributes::Vertex>> opacityVertexBuffer;
         optional<gl::IndexBuffer<gl::Lines>> indexBuffer;
     } collisionBox;
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp
index 4435aaa90c..92aed48409 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp
@@ -246,6 +246,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters, RenderSource*) {
                     uniforms::u_camera_to_center_distance::Value{ parameters.state.getCameraToCenterDistance() }
                 },
                 *bucket.collisionBox.vertexBuffer,
+                *bucket.collisionBox.opacityVertexBuffer,
                 *bucket.collisionBox.indexBuffer,
                 bucket.collisionBox.segments,
                 paintAttributeData,