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

CJK overflow - update to match gl-shader #5908

Merged
merged 19 commits into from
Aug 11, 2016
Merged

CJK overflow - update to match gl-shader #5908

merged 19 commits into from
Aug 11, 2016

Conversation

amyleew
Copy link
Contributor

@amyleew amyleew commented Aug 8, 2016

@amyleew
Copy link
Contributor Author

amyleew commented Aug 9, 2016

Looking good in Xcode! @brunoabinader can you take a final 👀

screen shot 2016-08-08 at 6 55 10 pm

@friedbunny friedbunny added GL JS parity For feature parity with Mapbox GL JS Core The cross-platform C++ core, aka mbgl labels Aug 10, 2016
@friedbunny
Copy link
Contributor

When it comes time to merge this, please squash and prefix the commit with [core].

@lucaswoj
Copy link
Contributor

lucaswoj commented Aug 10, 2016

The only shaders with a a_data1 attribute were icon and sdf. Because this PR removes that attribute in both cases, we need to make changes everywhere in the codebase that a_data1 and a_data2 are referenced.

Until all these are changed, I would expect segfaults, rendering errors, and compilation errors.

@amyleew
Copy link
Contributor Author

amyleew commented Aug 11, 2016

Finally we got green 🍏 ✅ @lucaswoj @xrwang @jakepruitt !!!

Can't wait to :shipit: first thing tomorrow

@amyleew amyleew merged commit b0cb871 into master Aug 11, 2016
@amyleew amyleew deleted the shader branch August 11, 2016 16:49
@1ec5
Copy link
Contributor

1ec5 commented Aug 11, 2016

/ref #5873 #1681

@amyleew amyleew mentioned this pull request Aug 11, 2016
2 tasks
@lucaswoj
Copy link
Contributor

Was this ready to merge? I don't see a PR review from any GL Native core contributors or #5908 (comment) having been addressed.

@amyleew
Copy link
Contributor Author

amyleew commented Aug 11, 2016

Perhaps I misunderstood the PR review. Also I pushed squash and commit with the commit. #5873 was taken care off, thought #1681 was a GL native bug to fix seperately since this was happening with the original sized atlas as well.

@1ec5
Copy link
Contributor

1ec5 commented Aug 11, 2016

#1681 is the original ticket tracking CJK glyph overflow issues.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Core The cross-platform C++ core, aka mbgl GL JS parity For feature parity with Mapbox GL JS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants