lp:~smspillaz/unity/unity.oem-fixes

Branch merges

Merged into lp:unity/4.0 at revision 1726

Jason Smith (community): Approve on 2012-01-05

Robert Carr (community): Approve on 2012-01-04

Diff: 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)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #838128: compiz assert failure: compiz: /usr/include/boost/smart_ptr/shared_ptr.hpp:418: T* boost::shared_ptr<T>::operator->() const [with T = UnityFBO]: Assertion `px != 0' failed.	Critical	Fix Released
Bug #861061: [regression] All apps have a lower frame rate under Unity.	High	Fix Released
Bug #864037: workspace switcher zoom failure with multiple monitors	Medium	Fix Released
Bug #864784: Enabling second monitor causes crash.	High	Fix Released
Bug #868120: Use one framebuffer object per screen	Medium	Fix Released
Bug #872625: Workspace switcher displays incorrectly and has artifacts on mulitmonitor combinations where one monitor has a smaller resolution than the other	Medium	Fix Released
Bug #880707: [regression] Compiz: Visible tearing is worse in 11.10 than 11.04, even when "Sync To VBlank" is enabled, but only when Unity is active.	High	Fix Released

Link a bug report

Related blueprints

1730. By Sam Spilsbury on 2012-01-05

Check glGetError ()

1729. By Sam Spilsbury on 2012-01-05

Minor style fix - use for loop

1728. By Sam Spilsbury on 2012-01-05

Don't disable the scissor test explicitly

1727. By Sam Spilsbury on 2012-01-04

Added missing file

1726. By Sam Spilsbury on 2011-12-24

Added framebuffer object fixes

1725. By David Barth on 2011-12-15

changelog update, a patch was reverted earlier by gord, see rev. 1723

1724. By David Barth on 2011-12-15

merge lp:~macslow/unity/unity-sru1-4.26.0 in preparation of the 4.26 release candidate

1723. By Gord Allott on 2011-12-15

Reverted out r1713

1722. By Sam Spilsbury on 2011-12-15

Merged lp:~smspillaz/unity/unity4.0_fix_881190

1721. By Sam Spilsbury on 2011-12-15

    Inhibit other windows from leaving show desktop mode in the case that
    core tries to leave show desktop mode after a window was activated - in this
    case we should only allow the window that was activated to leave show desktop
    mode and keep the "show desktop" mode state on until the user explicitly leave
  s
    show desktop mode.

    Fixes LP #871801 and LP #899932