[core] Use fixed-size std::array for ImageSource coordinates

2 files changed, 6 insertions, 3 deletions

diff --git a/src/mbgl/renderer/buckets/raster_bucket.cpp b/src/mbgl/renderer/buckets/raster_bucket.cpp
index fa105fd38d..e0bfaf7b68 100644
--- a/src/mbgl/renderer/buckets/raster_bucket.cpp
+++ b/src/mbgl/renderer/buckets/raster_bucket.cpp
@@ -1,11 +1,12 @@
-#include <mbgl/gl/context.hpp>
-#include <mbgl/programs/raster_program.hpp>
 #include <mbgl/renderer/buckets/raster_bucket.hpp>
 #include <mbgl/renderer/layers/render_raster_layer.hpp>
+#include <mbgl/programs/raster_program.hpp>
 #include <mbgl/renderer/painter.hpp>
+#include <mbgl/gl/context.hpp>
 #include <mbgl/renderer/render_tile.hpp>
 
 namespace mbgl {
+
 using namespace style;
 
 RasterBucket::RasterBucket(UnassociatedImage&& image_) : image(std::move(image_)) {
@@ -17,7 +18,7 @@ RasterBucket::RasterBucket(RasterBucket&& other) : image(std::move(other.image))
 
 void RasterBucket::upload(gl::Context& context) {
     texture = context.createTexture(image);
-    if (vertices.vertexSize() > 0) {
+    if (!vertices.empty()) {
         vertexBuffer = context.createVertexBuffer(std::move(vertices));
         indexBuffer = context.createIndexBuffer(std::move(indices));
     }
diff --git a/src/mbgl/renderer/buckets/raster_bucket.hpp b/src/mbgl/renderer/buckets/raster_bucket.hpp
index b7b1d312dc..08afa6ddfa 100644
--- a/src/mbgl/renderer/buckets/raster_bucket.hpp
+++ b/src/mbgl/renderer/buckets/raster_bucket.hpp
@@ -27,6 +27,8 @@ public:
     UnassociatedImage image;
     optional<gl::Texture> texture;
 
+    // Bucket specific vertices are used for Image Sources only
+    // Raster Tile Sources use the default buffers from Painter
     gl::VertexVector<RasterLayoutVertex> vertices;
     gl::IndexVector<gl::Triangles> indices;
     gl::SegmentVector<RasterAttributes> segments;