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/gl | |
parent | 2f646af255bf05bd50070deb83bb89e48509afc4 (diff) | |
download | qtlocation-mapboxgl-f13c2b86e427e29a856ca8f0f79379203c61f431.tar.gz |
[core] unify *Buffer/Vector naming
Diffstat (limited to 'src/mbgl/gl')
-rw-r--r-- | src/mbgl/gl/context.hpp | 16 | ||||
-rw-r--r-- | src/mbgl/gl/index_buffer.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/gl/vertex_buffer.hpp | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/mbgl/gl/context.hpp b/src/mbgl/gl/context.hpp index 85e35d4d70..ad62853495 100644 --- a/src/mbgl/gl/context.hpp +++ b/src/mbgl/gl/context.hpp @@ -68,29 +68,29 @@ public: template <class Vertex> VertexBuffer<Vertex> createVertexBuffer(gfx::VertexVector<Vertex>&& v, const BufferUsage usage = BufferUsage::StaticDraw) { return VertexBuffer<Vertex> { - v.vertexSize(), - createVertexBuffer(v.data(), v.byteSize(), usage) + v.elements(), + createVertexBuffer(v.data(), v.bytes(), usage) }; } template <class Vertex> void updateVertexBuffer(VertexBuffer<Vertex>& buffer, gfx::VertexVector<Vertex>&& v) { - assert(v.vertexSize() == buffer.vertexCount); - updateVertexBuffer(buffer.buffer, v.data(), v.byteSize()); + assert(v.elements() == buffer.elements); + updateVertexBuffer(buffer.buffer, v.data(), v.bytes()); } template <class DrawMode> IndexBuffer createIndexBuffer(gfx::IndexVector<DrawMode>&& v, const BufferUsage usage = BufferUsage::StaticDraw) { return IndexBuffer { - v.indexSize(), - createIndexBuffer(v.data(), v.byteSize(), usage) + v.elements(), + createIndexBuffer(v.data(), v.bytes(), usage) }; } template <class DrawMode> void updateIndexBuffer(IndexBuffer& buffer, gfx::IndexVector<DrawMode>&& v) { - assert(v.indexSize() == buffer.indexCount); - updateIndexBuffer(buffer.buffer, v.data(), v.byteSize()); + assert(v.elements() == buffer.elements); + updateIndexBuffer(buffer.buffer, v.data(), v.bytes()); } template <RenderbufferType type> diff --git a/src/mbgl/gl/index_buffer.hpp b/src/mbgl/gl/index_buffer.hpp index a506c5eacd..3b66e2b69c 100644 --- a/src/mbgl/gl/index_buffer.hpp +++ b/src/mbgl/gl/index_buffer.hpp @@ -7,7 +7,7 @@ namespace gl { class IndexBuffer { public: - std::size_t indexCount; + std::size_t elements; UniqueBuffer buffer; }; diff --git a/src/mbgl/gl/vertex_buffer.hpp b/src/mbgl/gl/vertex_buffer.hpp index b65e7f9a01..94963ce878 100644 --- a/src/mbgl/gl/vertex_buffer.hpp +++ b/src/mbgl/gl/vertex_buffer.hpp @@ -8,7 +8,7 @@ namespace gl { template <class V> class VertexBuffer { public: - std::size_t vertexCount; + std::size_t elements; UniqueBuffer buffer; }; |