[core] Added StaticRasterVertexBuffer

src/mbgl/geometry/static_vertex_buffer.cpp

@@ -3,12 +3,22 @@
 
 namespace mbgl {
 
-StaticVertexBuffer::StaticVertexBuffer(std::initializer_list<std::pair<int16_t, int16_t>> init) {
+StaticVertexBuffer::StaticVertexBuffer(std::initializer_list<std::pair<VertexType, VertexType>> init) {
  for (const auto& vertex : init) {
- vertex_type *vertices = static_cast<vertex_type *>(addElement());
+ VertexType* vertices = static_cast<VertexType*>(addElement());
  vertices[0] = vertex.first;
  vertices[1] = vertex.second;
  }
 }
 
+StaticRasterVertexBuffer::StaticRasterVertexBuffer(std::initializer_list<std::tuple<VertexType, VertexType, VertexType, VertexType>> init) {
+ for (const auto& vertex : init) {
+ VertexType* vertices = static_cast<VertexType*>(addElement());
+ vertices[0] = std::get<0>(vertex);
+ vertices[1] = std::get<1>(vertex);
+ vertices[2] = std::get<2>(vertex);
+ vertices[3] = std::get<3>(vertex);
+ }
+}
+
 } // namespace mbgl

src/mbgl/geometry/static_vertex_buffer.hpp

@@ -15,9 +15,18 @@ class StaticVertexBuffer : public Buffer<
  32 // default length
 > {
 public:
- typedef int16_t vertex_type;
+ using VertexType = int16_t;
+ StaticVertexBuffer(std::initializer_list<std::pair<VertexType, VertexType>>);
+};
 
- StaticVertexBuffer(std::initializer_list<std::pair<int16_t, int16_t>> init);
+class StaticRasterVertexBuffer : public Buffer<
+ 8, // bytes per vertex (4 * signed short == 8 bytes)
+ GL_ARRAY_BUFFER,
+ 32 // default length
+> {
+public:
+ using VertexType = int16_t;
+ StaticRasterVertexBuffer(std::initializer_list<std::tuple<VertexType, VertexType, VertexType, VertexType>>);
 };
 
 } // namespace mbgl

src/mbgl/renderer/raster_bucket.hpp

@@ -6,7 +6,7 @@
 namespace mbgl {
 
 class RasterShader;
-class StaticVertexBuffer;
+class StaticRasterVertexBuffer;
 class VertexArrayObject;
 
 class RasterBucket : public Bucket {