Merge lp:~azzar1/unity/fix-987304-5.0 into lp:unity/5.0

Proposed by Andrea Azzarone
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2352
Proposed branch: lp:~azzar1/unity/fix-987304-5.0
Merge into: lp:unity/5.0
Diff against target: 12 lines (+3/-0)
1 file modified
plugins/unityshell/src/ScreenEffectFramebufferObject.cpp (+3/-0)
To merge this branch: bzr merge lp:~azzar1/unity/fix-987304-5.0
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Review via email: mp+107017@code.launchpad.net

Commit message

Description of the change

Copy pasted from orginal MP:

Fix major performance regression-regression due to rebinding FBO's much more
often than is required (LP: #987304)

This commit just reintroduces the fix for LP: #861061 (the same performance
regression) which was deleted by the fix for LP: #839480 in Unity 5.10.

UPDATE: This is not a complete fix for bug 987304 as other (new) performance problems seem to be present in Unity 5.x. But it is a critical part of the fix for bug 987304.

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/ScreenEffectFramebufferObject.cpp'
2--- plugins/unityshell/src/ScreenEffectFramebufferObject.cpp 2012-03-23 15:02:53 +0000
3+++ plugins/unityshell/src/ScreenEffectFramebufferObject.cpp 2012-05-23 13:49:35 +0000
4@@ -101,6 +101,9 @@
5
6 void unity::ScreenEffectFramebufferObject::bind (const nux::Geometry &output)
7 {
8+ if (!BackgroundEffectHelper::HasDirtyHelpers())
9+ return;
10+
11 /* Clear the error bit */
12 glGetError ();
13

Subscribers

People subscribed via source and target branches

to all changes: