diff options
author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-08-30 13:26:23 +0200 |
---|---|---|
committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-06 13:17:23 +0200 |
commit | ec0b6df7db66405600c4609324205eb78c80fee5 (patch) | |
tree | 7b3552627713f33c413b622955f45babba660b35 /src/mbgl/gl/vertex_array.hpp | |
parent | 6cf6b729700d4665b761b58af8f3360aa33cfb31 (diff) | |
download | qtlocation-mapboxgl-ec0b6df7db66405600c4609324205eb78c80fee5.tar.gz |
down to 162 compile errors
Diffstat (limited to 'src/mbgl/gl/vertex_array.hpp')
-rw-r--r-- | src/mbgl/gl/vertex_array.hpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/mbgl/gl/vertex_array.hpp b/src/mbgl/gl/vertex_array.hpp index 604754f672..e64174e1a5 100644 --- a/src/mbgl/gl/vertex_array.hpp +++ b/src/mbgl/gl/vertex_array.hpp @@ -1,7 +1,7 @@ #pragma once -#include <mbgl/gl/object.hpp> #include <mbgl/gl/attribute.hpp> +#include <mbgl/gl/object.hpp> #include <mbgl/gl/state.hpp> #include <mbgl/gl/value.hpp> @@ -15,8 +15,7 @@ class Context; class VertexArrayState { public: - VertexArrayState(UniqueVertexArray vertexArray_) - : vertexArray(std::move(vertexArray_)) { + VertexArrayState(UniqueVertexArray vertexArray_) : vertexArray(std::move(vertexArray_)) { } void setDirty() { @@ -35,8 +34,8 @@ public: class VertexArrayStateDeleter { public: - VertexArrayStateDeleter(bool destroy_) - : destroy(destroy_) {} + VertexArrayStateDeleter(bool destroy_) : destroy(destroy_) { + } void operator()(VertexArrayState* ptr) const { if (destroy) { @@ -52,9 +51,9 @@ using UniqueVertexArrayState = std::unique_ptr<VertexArrayState, VertexArrayStat class VertexArray { public: - VertexArray(UniqueVertexArrayState state_) - : state(std::move(state_)) { + VertexArray(UniqueVertexArrayState state_) : state(std::move(state_)) { } + VertexArray(VertexArray&& other) = default; void bind(Context&, BufferID indexBuffer, const AttributeBindingArray&); |