-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[core] port the pattern-fill antialiasing fix from gl-js #4771
Conversation
47e9947
to
097cf73
Compare
Render tests from Travis are here: https://mapbox.s3.amazonaws.com/mapbox-gl-native/render-tests/11966.1/index.html
@jfirebaugh mentioned in chat that I should try the conditional I will continue poking around, but if anyone has suggestions I'd love to hear them! |
@ansis Can you help @mollymerp here? 🙇 |
The render tests look right to me. The antialiasing doesn't match -js but that's expected because -js renders antialiasing wrong in headless testing: mapbox/mapbox-gl-js#2080 I think the failing outline test can be disabled in -native until we fix the antialising issue. |
config.activeTexture = GL_TEXTURE0; | ||
spriteAtlas->bind(true, glObjectStore); | ||
|
||
setDepthSublayer(0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this should be setDepthSublayer(2);
like the non-pattern antialiasing call.
What this does is draws the outline at a further depth so that it doesn't get drawn on top of the inner part of the fill.
Once https://github.com/mapbox/mapbox-gl-native/pull/4771/files#r61337105 is fixed and tests failing because of antialiasing differences are disabled I think this should be good to merge. @jfirebaugh do you still want to review anything here? |
LGTM! |
700fe38
to
d3a7e7c
Compare
Updated the render test for thank you to @tmpsantos for helping me troubleshoot the failing builds! 💯 once everything is green, this is good to 🚢 @ansis ? |
d3a7e7c
to
11b544a
Compare
🚢! |
f6e0b98
to
6c7d31c
Compare
…to native add outlinepattern shader class to relevant files add outlinepattern code to painter_fill.cpp add outlinepattern code to fill_bucket refactor painter_fill, fix tests fix merge conflicts and setDepthSublayer update render test to no antialiasing so travis will be happy
6c7d31c
to
c86f558
Compare
just like this