diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-12-09 17:13:01 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-12-13 09:42:46 -0800 |
| commit | c12b52c6a7c90e3135712bcb99fa4b0904701295 (patch) | |
| tree | d34a5fa8f8547982d42bc2abed1354adddc5e3cb | |
| parent | 36616c7200d51e2fd66b00c9c66bb3a83ba5a880 (diff) | |
| download | qtlocation-mapboxgl-c12b52c6a7c90e3135712bcb99fa4b0904701295.tar.gz | |
[core] Fix debug rendering
* Off-by-one in DebugBucket indexing
* Must unbind VAO before binding index buffer in Context::createIndexBuffer
| -rw-r--r-- | src/mbgl/gl/context.cpp | 1 | ||||
| -rw-r--r-- | src/mbgl/renderer/debug_bucket.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/gl/context.cpp b/src/mbgl/gl/context.cpp index e4cc5e0fe3..5048ffcd66 100644 --- a/src/mbgl/gl/context.cpp +++ b/src/mbgl/gl/context.cpp @@ -105,6 +105,7 @@ UniqueBuffer Context::createIndexBuffer(const void* data, std::size_t size) { BufferID id = 0; MBGL_CHECK_ERROR(glGenBuffers(1, &id)); UniqueBuffer result { std::move(id), { this } }; + vertexArrayObject = 0; elementBuffer = result; MBGL_CHECK_ERROR(glBufferData(GL_ELEMENT_ARRAY_BUFFER, size, data, GL_STATIC_DRAW)); return result; diff --git a/src/mbgl/renderer/debug_bucket.cpp b/src/mbgl/renderer/debug_bucket.cpp index ef5e4f8d0f..167df4376f 100644 --- a/src/mbgl/renderer/debug_bucket.cpp +++ b/src/mbgl/renderer/debug_bucket.cpp @@ -46,8 +46,8 @@ DebugBucket::DebugBucket(const OverscaledTileID& id, vertices.emplace_back(FillAttributes::vertex(p)); if (prev) { - indices.emplace_back(vertices.vertexSize() - 1, - vertices.vertexSize()); + indices.emplace_back(vertices.vertexSize() - 2, + vertices.vertexSize() - 1); } prev = p; |