From 549929cefd7073708e64e49da93e8b49fbc0db99 Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Wed, 2 Nov 2016 15:43:30 +0200 Subject: [PATCH] [core] Set bucket segments to initialize empty --- cmake/test-files.cmake | 1 + src/mbgl/layout/symbol_layout.cpp | 2 +- src/mbgl/renderer/circle_bucket.cpp | 2 +- src/mbgl/renderer/circle_bucket.hpp | 2 +- src/mbgl/renderer/fill_bucket.cpp | 4 +-- src/mbgl/renderer/fill_bucket.hpp | 4 +-- src/mbgl/renderer/line_bucket.cpp | 3 +-- src/mbgl/renderer/line_bucket.hpp | 2 +- src/mbgl/renderer/symbol_bucket.cpp | 2 +- src/mbgl/renderer/symbol_bucket.hpp | 4 +-- test/gl/bucket.test.cpp | 41 +++++++++++++++++++++++++++++ 11 files changed, 54 insertions(+), 13 deletions(-) create mode 100644 test/gl/bucket.test.cpp diff --git a/cmake/test-files.cmake b/cmake/test-files.cmake index 598e01822..ceff50ef6 100644 --- a/cmake/test-files.cmake +++ b/cmake/test-files.cmake @@ -23,6 +23,7 @@ set(MBGL_TEST_FILES test/geometry/binpack.test.cpp # gl + test/gl/bucket.test.cpp test/gl/object.test.cpp # include/mbgl diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index fb0c67a48..f1886e807 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -448,7 +448,7 @@ void SymbolLayout::addSymbols(Buffer &buffer, const SymbolQuads &symbols, float minZoom = 0; } - if (buffer.segments.back().vertexLength + vertexLength > std::numeric_limits::max()) { + if (buffer.segments.empty() || buffer.segments.back().vertexLength + vertexLength > std::numeric_limits::max()) { buffer.segments.emplace_back(buffer.vertices.size(), buffer.triangles.size()); } diff --git a/src/mbgl/renderer/circle_bucket.cpp b/src/mbgl/renderer/circle_bucket.cpp index 9c1c5a6b4..3e98d725b 100644 --- a/src/mbgl/renderer/circle_bucket.cpp +++ b/src/mbgl/renderer/circle_bucket.cpp @@ -44,7 +44,7 @@ void CircleBucket::addGeometry(const GeometryCollection& geometryCollection) { if ((mode != MapMode::Still) && (x < 0 || x >= util::EXTENT || y < 0 || y >= util::EXTENT)) continue; - if (segments.back().vertexLength + vertexLength > std::numeric_limits::max()) { + if (segments.empty() || segments.back().vertexLength + vertexLength > std::numeric_limits::max()) { // Move to a new segments because the old one can't hold the geometry. segments.emplace_back(vertices.size(), triangles.size()); } diff --git a/src/mbgl/renderer/circle_bucket.hpp b/src/mbgl/renderer/circle_bucket.hpp index 494e64cc0..a682d423d 100644 --- a/src/mbgl/renderer/circle_bucket.hpp +++ b/src/mbgl/renderer/circle_bucket.hpp @@ -22,7 +22,7 @@ public: std::vector vertices; std::vector triangles; - std::vector segments { { 0, 0 } }; + std::vector segments; optional> vertexBuffer; optional> indexBuffer; diff --git a/src/mbgl/renderer/fill_bucket.cpp b/src/mbgl/renderer/fill_bucket.cpp index 86b3946f6..6a5cc09e6 100644 --- a/src/mbgl/renderer/fill_bucket.cpp +++ b/src/mbgl/renderer/fill_bucket.cpp @@ -51,7 +51,7 @@ void FillBucket::addGeometry(const GeometryCollection& geometry) { if (nVertices == 0) continue; - if (lineSegments.back().vertexLength + nVertices > std::numeric_limits::max()) { + if (lineSegments.empty() || lineSegments.back().vertexLength + nVertices > std::numeric_limits::max()) { lineSegments.emplace_back(vertices.size(), lines.size()); } @@ -76,7 +76,7 @@ void FillBucket::addGeometry(const GeometryCollection& geometry) { std::size_t nIndicies = indices.size(); assert(nIndicies % 3 == 0); - if (triangleSegments.back().vertexLength + totalVertices > std::numeric_limits::max()) { + if (triangleSegments.empty() || triangleSegments.back().vertexLength + totalVertices > std::numeric_limits::max()) { triangleSegments.emplace_back(startVertices, triangles.size()); } diff --git a/src/mbgl/renderer/fill_bucket.hpp b/src/mbgl/renderer/fill_bucket.hpp index 58fa916f8..715b8e274 100644 --- a/src/mbgl/renderer/fill_bucket.hpp +++ b/src/mbgl/renderer/fill_bucket.hpp @@ -22,8 +22,8 @@ public: std::vector vertices; std::vector lines; std::vector triangles; - std::vector lineSegments { { 0, 0 } }; - std::vector triangleSegments { { 0, 0 } }; + std::vector lineSegments; + std::vector triangleSegments; optional> vertexBuffer; optional> lineIndexBuffer; diff --git a/src/mbgl/renderer/line_bucket.cpp b/src/mbgl/renderer/line_bucket.cpp index 0298e174a..9856684c5 100644 --- a/src/mbgl/renderer/line_bucket.cpp +++ b/src/mbgl/renderer/line_bucket.cpp @@ -348,8 +348,7 @@ void LineBucket::addGeometry(const GeometryCoordinates& coordinates) { const std::size_t endVertex = vertices.size(); const std::size_t vertexCount = endVertex - startVertex; - if (segments.back().vertexLength + vertexCount > std::numeric_limits::max()) { - // Move to a new group because the old one can't hold the geometry. + if (segments.empty() || segments.back().vertexLength + vertexCount > std::numeric_limits::max()) { segments.emplace_back(startVertex, triangles.size()); } diff --git a/src/mbgl/renderer/line_bucket.hpp b/src/mbgl/renderer/line_bucket.hpp index 3ee142a70..7b4c5f1b5 100644 --- a/src/mbgl/renderer/line_bucket.hpp +++ b/src/mbgl/renderer/line_bucket.hpp @@ -28,7 +28,7 @@ public: std::vector vertices; std::vector triangles; - std::vector segments { { 0, 0 } }; + std::vector segments; optional> vertexBuffer; optional> indexBuffer; diff --git a/src/mbgl/renderer/symbol_bucket.cpp b/src/mbgl/renderer/symbol_bucket.cpp index 5edf74291..7fb347396 100644 --- a/src/mbgl/renderer/symbol_bucket.cpp +++ b/src/mbgl/renderer/symbol_bucket.cpp @@ -42,7 +42,7 @@ void SymbolBucket::render(Painter& painter, } bool SymbolBucket::hasData() const { - assert(false); // Should be calling SymbolLayout::hasSymbolInstances() instead. + assert(false); // Should be calling SymbolLayout::has{Text,Icon,CollisonBox}Data() instead. return false; } diff --git a/src/mbgl/renderer/symbol_bucket.hpp b/src/mbgl/renderer/symbol_bucket.hpp index 881475e4a..a905e2536 100644 --- a/src/mbgl/renderer/symbol_bucket.hpp +++ b/src/mbgl/renderer/symbol_bucket.hpp @@ -36,7 +36,7 @@ public: struct TextBuffer { std::vector vertices; std::vector triangles; - std::vector segments { { 0, 0 } }; + std::vector segments; optional> vertexBuffer; optional> indexBuffer; @@ -45,7 +45,7 @@ public: struct IconBuffer { std::vector vertices; std::vector triangles; - std::vector segments { { 0, 0 } }; + std::vector segments; optional> vertexBuffer; optional> indexBuffer; diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp new file mode 100644 index 000000000..419aee183 --- /dev/null +++ b/test/gl/bucket.test.cpp @@ -0,0 +1,41 @@ +#include + +#include +#include +#include +#include + +#include + +#include + +TEST(Buckets, CircleBucket) { + mbgl::MapMode mapMode = mbgl::MapMode::Still; + + mbgl::CircleBucket bucket { mapMode }; + ASSERT_FALSE(bucket.hasData()); +} + +TEST(Buckets, FillBucket) { + mbgl::FillBucket bucket; + ASSERT_FALSE(bucket.hasData()); +} + +TEST(Buckets, LineBucket) { + uint32_t overscaling = 0; + + mbgl::LineBucket bucket { overscaling }; + ASSERT_FALSE(bucket.hasData()); +} + +TEST(Buckets, SymbolBucket) { + mbgl::MapMode mapMode = mbgl::MapMode::Still; + mbgl::style::SymbolLayoutProperties properties; + bool sdfIcons = false; + bool iconsNeedLinear = false; + + mbgl::SymbolBucket bucket { mapMode, properties, sdfIcons, iconsNeedLinear }; + ASSERT_FALSE(bucket.hasIconData()); + ASSERT_FALSE(bucket.hasTextData()); + ASSERT_FALSE(bucket.hasCollisionBoxData()); +}