diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-02-28 12:25:45 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-02-28 12:25:45 +0100 |
| commit | 4e73a4d47cd1287f6a5ac3bfc66dc024b0b268e4 (patch) | |
| tree | 70def4e281be863605a6c93d9ec51be7b6497c69 /include/llmr/renderer/fill_bucket.hpp | |
| parent | ae3bd04171a671a877c3240ed505096186c280cc (diff) | |
| parent | 675b8eb1fef9e4fc99516b2fa64505107b1fa6bf (diff) | |
| download | qtlocation-mapboxgl-4e73a4d47cd1287f6a5ac3bfc66dc024b0b268e4.tar.gz | |
Merge branch 'master' into tessellation
Conflicts:
include/llmr/renderer/fill_bucket.hpp
src/renderer/fill_bucket.cpp
src/renderer/painter.cpp
Diffstat (limited to 'include/llmr/renderer/fill_bucket.hpp')
| -rw-r--r-- | include/llmr/renderer/fill_bucket.hpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/llmr/renderer/fill_bucket.hpp b/include/llmr/renderer/fill_bucket.hpp index d5f36211e5..4c82b7b315 100644 --- a/include/llmr/renderer/fill_bucket.hpp +++ b/include/llmr/renderer/fill_bucket.hpp @@ -68,10 +68,11 @@ private: std::shared_ptr<LineElementsBuffer> lineElementsBuffer; // hold information on where the vertices are located in the FillBuffer - const uint32_t vertex_start; - const uint32_t triangle_elements_start; - const uint32_t line_elements_start; + const size_t vertex_start; + const size_t triangle_elements_start; + const size_t line_elements_start; VertexArrayObject array; + std::vector<triangle_group_type> triangleGroups; std::vector<line_group_type> lineGroups; |