Merge lp://qastaging/~smspillaz/unity/unity.oem-fixes into lp://qastaging/unity/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 |
Related bugs: |
|
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.
+1. Though, I'm wondering if it should always be GL_LINEAR? Didn't we have a setting for that?