diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-08-14 18:24:53 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-08-14 18:30:45 +0200 |
| commit | d6bfb4be651d512708d953a26f27907c4f7940d7 (patch) | |
| tree | 9bef6e8fe99e9b00087a3dee94408aa899c3f1ae /include/mbgl/geometry | |
| parent | 1799c1b04c7123fa66fe333bdabf0ba575c9c54c (diff) | |
| download | qtlocation-mapboxgl-d6bfb4be651d512708d953a26f27907c4f7940d7.tar.gz | |
fix binding to vaos
Diffstat (limited to 'include/mbgl/geometry')
| -rw-r--r-- | include/mbgl/geometry/elements_buffer.hpp | 3 | ||||
| -rw-r--r-- | include/mbgl/geometry/vao.hpp | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/mbgl/geometry/elements_buffer.hpp b/include/mbgl/geometry/elements_buffer.hpp index ed60338e08..ce07c9fa67 100644 --- a/include/mbgl/geometry/elements_buffer.hpp +++ b/include/mbgl/geometry/elements_buffer.hpp @@ -6,8 +6,9 @@ namespace mbgl { +template <int count> struct ElementGroup { - VertexArrayObject array; + std::array<VertexArrayObject, count> array; uint32_t vertex_length; uint32_t elements_length; diff --git a/include/mbgl/geometry/vao.hpp b/include/mbgl/geometry/vao.hpp index e27e2c58a4..1023fc118d 100644 --- a/include/mbgl/geometry/vao.hpp +++ b/include/mbgl/geometry/vao.hpp @@ -22,7 +22,7 @@ public: if (shader_ptr != &shader) { if (shader_ptr != nullptr) { - fprintf(stderr, "shader rebind!"); + throw std::runtime_error("shader rebind!"); } #endif vertex_buffer.bind(); @@ -55,6 +55,9 @@ public: } if (shader_ptr != &shader) { + if (shader_ptr != nullptr) { + throw std::runtime_error("shader rebind!"); + } #endif vertex_buffer.bind(); elements_buffer.bind(); |