diff options
| author | Brad Leege <bleege@gmail.com> | 2016-06-09 14:35:10 -0500 |
|---|---|---|
| committer | Brad Leege <bleege@gmail.com> | 2016-06-09 14:35:10 -0500 |
| commit | b90571107d6fa5dd970d77c0b67029de8cd3461a (patch) | |
| tree | db6e2015be88f435b6e890fc9a5cf6a305e2a815 /src/mbgl/geometry/vao.hpp | |
| parent | d67b88dba94a5e50eabaa8c133bb66fc3da8ee6f (diff) | |
| download | qtlocation-mapboxgl-b90571107d6fa5dd970d77c0b67029de8cd3461a.tar.gz | |
[android] #5291 - Fixing merge conflicts
Diffstat (limited to 'src/mbgl/geometry/vao.hpp')
| -rw-r--r-- | src/mbgl/geometry/vao.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/geometry/vao.hpp b/src/mbgl/geometry/vao.hpp index 979bc2a54c..150a6badbd 100644 --- a/src/mbgl/geometry/vao.hpp +++ b/src/mbgl/geometry/vao.hpp @@ -25,7 +25,7 @@ public: if (bound_shader == 0) { vertexBuffer.bind(store); shader.bind(offset); - if (vao.created()) { + if (vao) { storeBinding(shader, vertexBuffer.getID(), 0, offset); } } else { @@ -40,7 +40,7 @@ public: vertexBuffer.bind(store); elementsBuffer.bind(store); shader.bind(offset); - if (vao.created()) { + if (vao) { storeBinding(shader, vertexBuffer.getID(), elementsBuffer.getID(), offset); } } else { |