summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/buckets/raster_bucket.cpp
diff options
context:
space:
mode:
authorAsheem Mamoowala <asheem.mamoowala@mapbox.com>2017-05-31 11:53:04 -0700
committerAsheem Mamoowala <asheem.mamoowala@mapbox.com>2017-06-01 15:38:01 -0700
commit8b37a0704c7c20b1664fee3dfcc79139982a1ce7 (patch)
tree9c0a50330b7e4f152a3a9ee25685fcbe8b9a4df4 /src/mbgl/renderer/buckets/raster_bucket.cpp
parent843da07b28a840fd850056c4b15d492ccc76a646 (diff)
downloadqtlocation-mapboxgl-8b37a0704c7c20b1664fee3dfcc79139982a1ce7.tar.gz
[core] Use fixed-size std::array for ImageSource coordinates
Diffstat (limited to 'src/mbgl/renderer/buckets/raster_bucket.cpp')
-rw-r--r--src/mbgl/renderer/buckets/raster_bucket.cpp7
1 files changed, 4 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));
}