summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/buckets/symbol_bucket.hpp
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-03-05 16:07:58 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-03-06 16:12:51 +0100
commit4737a45383911fcddf93f0a33e7e25246a5da07e (patch)
treea41a32f4d05297ede3c6d685cabf81a0f6dadcdc /src/mbgl/renderer/buckets/symbol_bucket.hpp
parentf13c2b86e427e29a856ca8f0f79379203c61f431 (diff)
downloadqtlocation-mapboxgl-4737a45383911fcddf93f0a33e7e25246a5da07e.tar.gz
[core] move IndexBuffer to gfx namespace
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
-rw-r--r--src/mbgl/renderer/buckets/symbol_bucket.hpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp
index 2d58a7ce0f..c28a2cbc95 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.hpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp
@@ -3,7 +3,7 @@
#include <mbgl/renderer/bucket.hpp>
#include <mbgl/map/mode.hpp>
#include <mbgl/gl/vertex_buffer.hpp>
-#include <mbgl/gl/index_buffer.hpp>
+#include <mbgl/gfx/index_buffer.hpp>
#include <mbgl/programs/segment.hpp>
#include <mbgl/programs/symbol_program.hpp>
#include <mbgl/programs/collision_box_program.hpp>
@@ -98,7 +98,7 @@ public:
optional<gl::VertexBuffer<SymbolLayoutVertex>> vertexBuffer;
optional<gl::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer;
optional<gl::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer;
- optional<gl::IndexBuffer> indexBuffer;
+ optional<gfx::IndexBuffer> indexBuffer;
} text;
std::unique_ptr<SymbolSizeBinder> iconSizeBinder;
@@ -115,7 +115,7 @@ public:
optional<gl::VertexBuffer<SymbolLayoutVertex>> vertexBuffer;
optional<gl::VertexBuffer<gfx::Vertex<SymbolDynamicLayoutAttributes>>> dynamicVertexBuffer;
optional<gl::VertexBuffer<gfx::Vertex<SymbolOpacityAttributes>>> opacityVertexBuffer;
- optional<gl::IndexBuffer> indexBuffer;
+ optional<gfx::IndexBuffer> indexBuffer;
} icon;
struct CollisionBuffer {
@@ -129,12 +129,12 @@ public:
struct CollisionBoxBuffer : public CollisionBuffer {
gfx::IndexVector<gfx::Lines> lines;
- optional<gl::IndexBuffer> indexBuffer;
+ optional<gfx::IndexBuffer> indexBuffer;
} collisionBox;
struct CollisionCircleBuffer : public CollisionBuffer {
gfx::IndexVector<gfx::Triangles> triangles;
- optional<gl::IndexBuffer> indexBuffer;
+ optional<gfx::IndexBuffer> indexBuffer;
} collisionCircle;
uint32_t bucketInstanceId = 0;