diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-21 23:11:27 +0300 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-07-22 12:23:39 +0300 |
| commit | 11bfe2398111dbca232b744db9b50119e7d3c495 (patch) | |
| tree | 02bc511e315832a780d18ca8f51a8003e5741cb2 /test | |
| parent | 3184cb29db069e990dab1ea4e784aad0aaa1048b (diff) | |
| download | qtlocation-mapboxgl-11bfe2398111dbca232b744db9b50119e7d3c495.tar.gz | |
[core] Symbol bucket uses shared layout
sizeof(SymbolBucket): 2296 -> 1024
Diffstat (limited to 'test')
| -rw-r--r-- | test/gl/bucket.test.cpp | 4 | ||||
| -rw-r--r-- | test/text/cross_tile_symbol_index.test.cpp | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp index ff01b590fc..9c9847cf4d 100644 --- a/test/gl/bucket.test.cpp +++ b/test/gl/bucket.test.cpp @@ -114,7 +114,7 @@ TEST(Buckets, SymbolBucket) { gl::HeadlessBackend backend({ 512, 256 }); gfx::BackendScope scope { backend }; - style::SymbolLayoutProperties::PossiblyEvaluated layout; + auto layout = makeMutable<style::SymbolLayoutProperties::PossiblyEvaluated>(); bool sdfIcons = false; bool iconsNeedLinear = false; bool sortFeaturesByY = false; @@ -122,7 +122,7 @@ TEST(Buckets, SymbolBucket) { std::vector<SymbolInstance> symbolInstances; gl::Context context{ backend }; - SymbolBucket bucket { layout, {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(symbolInstances), 1.0f }; + SymbolBucket bucket { std::move(layout), {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(symbolInstances), 1.0f }; ASSERT_FALSE(bucket.hasIconData()); ASSERT_FALSE(bucket.hasTextData()); ASSERT_FALSE(bucket.hasCollisionBoxData()); diff --git a/test/text/cross_tile_symbol_index.test.cpp b/test/text/cross_tile_symbol_index.test.cpp index f121781766..841f73c699 100644 --- a/test/text/cross_tile_symbol_index.test.cpp +++ b/test/text/cross_tile_symbol_index.test.cpp @@ -21,7 +21,8 @@ TEST(CrossTileSymbolLayerIndex, addBucket) { uint32_t maxBucketInstanceId = 0; CrossTileSymbolLayerIndex index; - style::SymbolLayoutProperties::PossiblyEvaluated layout; + Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> layout = + makeMutable<style::SymbolLayoutProperties::PossiblyEvaluated>(); bool sdfIcons = false; bool iconsNeedLinear = false; bool sortFeaturesByY = false; @@ -95,7 +96,8 @@ TEST(CrossTileSymbolLayerIndex, resetIDs) { uint32_t maxBucketInstanceId = 0; CrossTileSymbolLayerIndex index; - style::SymbolLayoutProperties::PossiblyEvaluated layout; + Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> layout = + makeMutable<style::SymbolLayoutProperties::PossiblyEvaluated>(); bool sdfIcons = false; bool iconsNeedLinear = false; bool sortFeaturesByY = false; @@ -135,7 +137,8 @@ TEST(CrossTileSymbolLayerIndex, noDuplicatesWithinZoomLevel) { uint32_t maxBucketInstanceId = 0; CrossTileSymbolLayerIndex index; - style::SymbolLayoutProperties::PossiblyEvaluated layout; + Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> layout = + makeMutable<style::SymbolLayoutProperties::PossiblyEvaluated>(); bool sdfIcons = false; bool iconsNeedLinear = false; bool sortFeaturesByY = false; @@ -173,7 +176,8 @@ TEST(CrossTileSymbolLayerIndex, bucketReplacement) { uint32_t maxBucketInstanceId = 0; CrossTileSymbolLayerIndex index; - style::SymbolLayoutProperties::PossiblyEvaluated layout; + Immutable<style::SymbolLayoutProperties::PossiblyEvaluated> layout = + makeMutable<style::SymbolLayoutProperties::PossiblyEvaluated>(); bool sdfIcons = false; bool iconsNeedLinear = false; bool sortFeaturesByY = false; |