Unity

Merge lp://qastaging/~smspillaz/unity/unity.oem-fixes into lp://qastaging/unity/4.0

  1. unity.oem-fixes
  2. Merge into 4.0
Proposed by David Barth
Status: Merged
Approved by: David Barth
Approved revision: no longer in the source branch.
Merged at revision: 1726
Proposed branch: lp://qastaging/~smspillaz/unity/unity.oem-fixes
Merge into: lp://qastaging/unity/4.0
Diff against target: 1711 lines (+1184/-294)
12 files modified
plugins/unityshell/src/BackgroundEffectHelper.cpp (+13/-0)
plugins/unityshell/src/BackgroundEffectHelper.h (+1/-1)
plugins/unityshell/src/PanelView.cpp (+1/-2)
plugins/unityshell/src/ScreenEffectFramebufferObject.cpp (+234/-0)
plugins/unityshell/src/ScreenEffectFramebufferObject.h (+84/-0)
plugins/unityshell/src/comptransientfor.cpp (+2/-0)
plugins/unityshell/src/unityshell.cpp (+73/-256)
plugins/unityshell/src/unityshell.h (+7/-35)
tests/CMakeLists.txt (+14/-0)
tests/GLFuncLoader.cpp (+51/-0)
tests/GLFuncLoader.h (+33/-0)
tests/TestScreenEffectFramebufferObject.cpp (+671/-0)
To merge this branch: bzr merge lp://qastaging/~smspillaz/unity/unity.oem-fixes
Reviewer Review Type Date Requested Status
Jason Smith (community) Approve
Robert Carr (community) Approve
Review via email: mp+87493@code.qastaging.launchpad.net

Description of the change

Fix for bug #838128, which is on the OEM priority list.

To post a comment you must log in.
Revision history for this message
Robert Carr (robertcarr) wrote :

+1. Though, I'm wondering if it should always be GL_LINEAR? Didn't we have a setting for that?

review: Approve
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

It doesn't make sense to do texture filtering on the framebuffer object since its always painted on-screen at the same position and same size.

Revision history for this message
Jason Smith (jassmith) wrote :

style fixes:
- please make sure to use brackets around all loops (for loops especially)

GL changes:
There is no reason to disable the scissor bit if you are going to pop the attrib right afterwards. Small change though I remember we ran into another weird state issue not long ago. I can't remember what exactly it was but it was something similar to this (multiple changes to the same bit in a row for no reason)

Please check the result of glGetError

review: Approve
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

done

Revision history for this message
Daniel van Vugt (vanvugt) wrote :

For the record, this proposal also contains the fixes for bug 861061 and bug 880707. This is because Sam's branches copied the fix from lp:~vanvugt/unity/fix-861061-trunk

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.

Subscribers

People subscribed via source and target branches

to all changes: