Unity

Merge lp://qastaging/~nick-dedekind/unity/lp1066788.cairo-text-stitching into lp://qastaging/unity

  1. lp1066788.cairo-text-stitching
  2. Merge into trunk
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
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::MaxTextureSize. (LP: #1066788)

Description of the change

= Problem description =

https://bugs.launchpad.net/unity/+bug/1066788
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::MaxTextureSize.

= Test coverage =

Added unit test for StaticCairoText to test splitting of texture.
test-gtest --gtest_filter=TestStaticCairoText.TextTextureSize

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

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 StandaloneApplicationPreivew...(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.

Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Hey Brandon, Nick,

as discussed during the week pre-UDS, no more manual tests permitted as we will have automated daily upload to ubuntu, and so, no way to have manual perf performed before a release. Please instrument this part of code so that we can have an unit test.

Revision history for this message
Stephen M. Webb (bregma) wrote :

Needs test.

review: Needs Fixing
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

Added test

Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/100/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/100/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/100/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

removed gcc-4.7 code and merged with trunk to resolve conflicts.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/170/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/170/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/170/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/186/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/186/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/186/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/187/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/187/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/187/console

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/196/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/196/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/196/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

fixed conflict merging with trunk.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/201/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/201/console

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.