Merge lp://qastaging/~nick-dedekind/unity/lp1066788.cairo-text-stitching into lp://qastaging/unity
Proposed by
Nick Dedekind
Status: | Merged |
---|---|
Approved by: | Nick Dedekind |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2953 |
Proposed branch: | lp://qastaging/~nick-dedekind/unity/lp1066788.cairo-text-stitching |
Merge into: | lp://qastaging/unity |
Diff against target: |
469 lines (+231/-35) 10 files modified
dash/previews/StandaloneApplicationPreview.cpp (+4/-3) tests/CMakeLists.txt (+1/-0) tests/test_previews_application.cpp (+1/-1) tests/test_previews_generic.cpp (+1/-1) tests/test_previews_movie.cpp (+1/-1) tests/test_previews_music.cpp (+1/-1) tests/test_previews_social.cpp (+1/-2) tests/test_static_cairo_text.cpp (+73/-0) unity-shared/StaticCairoText.cpp (+145/-26) unity-shared/StaticCairoText.h (+3/-0) |
To merge this branch: | bzr merge lp://qastaging/~nick-dedekind/unity/lp1066788.cairo-text-stitching |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Brandon Schaefer (community) | Approve | ||
Stephen M. Webb (community) | Needs Fixing | ||
Review via email: mp+131365@code.qastaging.launchpad.net |
Commit message
Split StaticCairoText text into multiple cached textures when the height of the required texture is over GpuInfo:
Description of the change
= Problem description =
https:/
Text labels with greater texture height than capable in OpenGL will not render correctly.
= The fix =
Split StaticCairoText text into multiple cached textures when the height of the required texture is over GpuInfo:
= Test coverage =
Added unit test for StaticCairoText to test splitting of texture.
test-gtest --gtest_
To post a comment you must log in.
Hmm code looks good, and confirmed fixes the crash for me...but there is no test :(
Possibly add a manual test that says to open the StandaloneAppli cationPreivew. ..(but they would have to compile...)
Or possibly a unit test that would attempt to make a texture that is to large and confirm that it is not returning NULL.