Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core] fix mixed sdf + non-sdf icon rendering in one layer #15456

Merged
merged 15 commits into from
Aug 26, 2019

Conversation

zmiao
Copy link
Contributor

@zmiao zmiao commented Aug 22, 2019

Fix: #14809
Render test: mapbox/mapbox-gl-js#8674

@zmiao zmiao marked this pull request as ready for review August 22, 2019 14:37
src/mbgl/layout/symbol_instance.cpp Outdated Show resolved Hide resolved
src/mbgl/layout/symbol_layout.cpp Outdated Show resolved Hide resolved
src/mbgl/layout/symbol_layout.cpp Outdated Show resolved Hide resolved
src/mbgl/layout/symbol_layout.cpp Show resolved Hide resolved
src/mbgl/layout/symbol_instance.cpp Show resolved Hide resolved
src/mbgl/layout/symbol_instance.hpp Outdated Show resolved Hide resolved
src/mbgl/layout/symbol_instance.cpp Outdated Show resolved Hide resolved
src/mbgl/layout/symbol_instance.cpp Outdated Show resolved Hide resolved
src/mbgl/layout/symbol_instance.hpp Outdated Show resolved Hide resolved
src/mbgl/layout/symbol_layout.cpp Outdated Show resolved Hide resolved
src/mbgl/renderer/buckets/symbol_bucket.cpp Show resolved Hide resolved
src/mbgl/text/placement.cpp Show resolved Hide resolved
src/mbgl/renderer/layers/render_symbol_layer.cpp Outdated Show resolved Hide resolved
src/mbgl/renderer/layers/render_symbol_layer.cpp Outdated Show resolved Hide resolved
@chloekraw chloekraw added 🍒 cherry pick Indicates that a PR is a cherry pick. needs cherrypick Indicates PR needs to be cherrypicked into the current release branch. and removed 🍒 cherry pick Indicates that a PR is a cherry pick. labels Aug 26, 2019
@chloekraw
Copy link
Contributor

thanks for this @zmiao! I'd like this cherrypicked into the release-queso branch, thank you!

@chloekraw chloekraw added the release blocker Blocks the next final release label Aug 26, 2019
@zmiao zmiao merged commit c770c23 into master Aug 26, 2019
@zmiao zmiao deleted the zmiao-sdf-icon-rendering branch August 26, 2019 18:57
@chloekraw chloekraw added the needs changelog Indicates PR needs a changelog entry prior to merging. label Aug 26, 2019
@chloekraw
Copy link
Contributor

chloekraw commented Aug 26, 2019

@zmiao also, would you mind drafting a changelog entry and/or providing a quick summary of the issue's root cause that we can use for the changelog? Thanks!

@zmiao
Copy link
Contributor Author

zmiao commented Aug 27, 2019

@chloekraw Thanks for the reminder, I opened a new pr for it, I will do the cherrypick afterwards.

zmiao added a commit that referenced this pull request Aug 27, 2019
* [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
zmiao added a commit that referenced this pull request Aug 27, 2019
…ne layer (#15494)

* [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

* Add changelog for fix of mixed SDF+non-SDF icon rendering in one layer (#15492)

* Add changelog for fix of mixed SDF+non-SDF icon rendering in one layer

* Add bracket for ios changelog number

* Add more brackets
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
needs changelog Indicates PR needs a changelog entry prior to merging. needs cherrypick Indicates PR needs to be cherrypicked into the current release branch. release blocker Blocks the next final release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rendering artifacts with sdf icons
4 participants