diff options
| author | zmiao <miao.zhao@mapbox.com> | 2019-08-26 21:54:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-26 21:54:59 +0300 |
| commit | c770c2326261ee22b22216538a2eaaed3648bc0d (patch) | |
| tree | 03725479de83005554f1d3df3d0c0df25c128a2f /test/gl | |
| parent | dbda6cc9e889278f391e45d952f57c95234b3f55 (diff) | |
| download | qtlocation-mapboxgl-c770c2326261ee22b22216538a2eaaed3648bc0d.tar.gz | |
[core] fix mixed sdf + non-sdf icon rendering in one layer (#15456)
* [core] fix icon symbol rendring when sdf and non-sdf icon in the same symbol layer
* fix build error
* fix typo
* revert renderableSegment change
* simplify codes
* fix build error
* refine sdf icon flag
* [core] fix mixed sdf + non-sdf icon rendering in one layer
* remove iconstatus getter in stymbol bucket
* fix review findings
* provide bitwise operator for SymbolContent enum
* use MBGL_MBGL_CONSTEXPR
* add one missing update for sdfIcon
* make renderer symbol type as enum
Diffstat (limited to 'test/gl')
| -rw-r--r-- | test/gl/bucket.test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/gl/bucket.test.cpp b/test/gl/bucket.test.cpp index cd21a027a2..f30606ee42 100644 --- a/test/gl/bucket.test.cpp +++ b/test/gl/bucket.test.cpp @@ -115,15 +115,15 @@ TEST(Buckets, SymbolBucket) { gfx::BackendScope scope { backend }; auto layout = makeMutable<style::SymbolLayoutProperties::PossiblyEvaluated>(); - bool sdfIcons = false; bool iconsNeedLinear = false; bool sortFeaturesByY = false; std::string bucketLeaderID = "test"; std::vector<SymbolInstance> symbolInstances; gl::Context context{ backend }; - SymbolBucket bucket { std::move(layout), {}, 16.0f, 1.0f, 0, sdfIcons, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(symbolInstances), 1.0f, false, {}}; + SymbolBucket bucket { std::move(layout), {}, 16.0f, 1.0f, 0, iconsNeedLinear, sortFeaturesByY, bucketLeaderID, std::move(symbolInstances), 1.0f, false, {}}; ASSERT_FALSE(bucket.hasIconData()); + ASSERT_FALSE(bucket.hasSdfIconData()); ASSERT_FALSE(bucket.hasTextData()); ASSERT_FALSE(bucket.hasCollisionBoxData()); ASSERT_FALSE(bucket.hasData()); |