diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-05-04 01:31:43 +0200 |
|---|---|---|
| committer | Lauren Budorick <lauren@mapbox.com> | 2018-05-03 16:31:43 -0700 |
| commit | c3346f473ac7e3d49219c8dbc381d92f8fe3f017 (patch) | |
| tree | 7e7d1c1569c849192209b0c5f5a58ef7736896a1 /src/mbgl/gl/vertex_array.hpp | |
| parent | f6da3ba9be27ff9b279730603c517c4cb5e57007 (diff) | |
| download | qtlocation-mapboxgl-c3346f473ac7e3d49219c8dbc381d92f8fe3f017.tar.gz | |
[core] Don't crash when attribute count is exceeded
Diffstat (limited to 'src/mbgl/gl/vertex_array.hpp')
| -rw-r--r-- | src/mbgl/gl/vertex_array.hpp | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/mbgl/gl/vertex_array.hpp b/src/mbgl/gl/vertex_array.hpp index 46c67017bb..604754f672 100644 --- a/src/mbgl/gl/vertex_array.hpp +++ b/src/mbgl/gl/vertex_array.hpp @@ -15,9 +15,8 @@ class Context; class VertexArrayState { public: - VertexArrayState(UniqueVertexArray vertexArray_, Context& context) - : vertexArray(std::move(vertexArray_)), - bindings(makeBindings(context, std::make_index_sequence<MAX_ATTRIBUTES>())) { + VertexArrayState(UniqueVertexArray vertexArray_) + : vertexArray(std::move(vertexArray_)) { } void setDirty() { @@ -31,13 +30,7 @@ public: State<value::BindElementBuffer> indexBuffer; using AttributeState = State<value::VertexAttribute, Context&, AttributeLocation>; - std::array<AttributeState, MAX_ATTRIBUTES> bindings; - -private: - template <std::size_t... I> - std::array<AttributeState, MAX_ATTRIBUTES> makeBindings(Context& context, std::index_sequence<I...>) { - return {{ AttributeState { context, I }... }}; - } + std::vector<AttributeState> bindings; }; class VertexArrayStateDeleter { |