diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-05 15:37:01 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-06 16:12:51 +0100 |
commit | f13c2b86e427e29a856ca8f0f79379203c61f431 (patch) | |
tree | b41fd7ab9d8d9b0e20caa31c161df684a844a3ae /src/mbgl/programs | |
parent | 2f646af255bf05bd50070deb83bb89e48509afc4 (diff) | |
download | qtlocation-mapboxgl-f13c2b86e427e29a856ca8f0f79379203c61f431.tar.gz |
[core] unify *Buffer/Vector naming
Diffstat (limited to 'src/mbgl/programs')
-rw-r--r-- | src/mbgl/programs/collision_box_program.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/programs/symbol_program.hpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/programs/collision_box_program.hpp b/src/mbgl/programs/collision_box_program.hpp index b8b5c7e054..ce672705f8 100644 --- a/src/mbgl/programs/collision_box_program.hpp +++ b/src/mbgl/programs/collision_box_program.hpp @@ -78,7 +78,7 @@ public: .concat(gl::Attributes<CollisionBoxDynamicAttributes>::bindings(dynamicVertexBuffer)) .concat(paintPropertyBinders.attributeBindings(currentProperties)); - assert(layoutVertexBuffer.vertexCount == dynamicVertexBuffer.vertexCount); + assert(layoutVertexBuffer.elements == dynamicVertexBuffer.elements); for (auto& segment : segments) { auto vertexArrayIt = segment.vertexArrays.find(layerID); diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp index 2eb1c0b4cd..1bb2580c1e 100644 --- a/src/mbgl/programs/symbol_program.hpp +++ b/src/mbgl/programs/symbol_program.hpp @@ -291,8 +291,8 @@ public: const gl::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>& opacityVertexBuffer, const Binders& paintPropertyBinders, const typename PaintProperties::PossiblyEvaluated& currentProperties) { - assert(layoutVertexBuffer.vertexCount == dynamicLayoutVertexBuffer.vertexCount && - layoutVertexBuffer.vertexCount == opacityVertexBuffer.vertexCount); + assert(layoutVertexBuffer.elements == dynamicLayoutVertexBuffer.elements && + layoutVertexBuffer.elements == opacityVertexBuffer.elements); return gl::Attributes<LayoutAttributeList>::bindings(layoutVertexBuffer) .concat(gl::Attributes<SymbolDynamicLayoutAttributes>::bindings(dynamicLayoutVertexBuffer)) .concat(gl::Attributes<SymbolOpacityAttributes>::bindings(opacityVertexBuffer)) |