Merge lp:~vanvugt/unity/fix-1037949-1036528 into lp:unity

Proposed by Daniel van Vugt on 2012-08-17
Status: Merged
Approved by: Tim Penhey on 2012-08-21
Approved revision: 2580
Merged at revision: 2593
Proposed branch: lp:~vanvugt/unity/fix-1037949-1036528
Merge into: lp:unity
Diff against target: 23 lines (+3/-1)
1 file modified
plugins/unityshell/src/unityshell.cpp (+3/-1)
To merge this branch: bzr merge lp:~vanvugt/unity/fix-1037949-1036528
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) 2012-08-17 Approve on 2012-08-20
Review via email: mp+120081@code.launchpad.net

Commit message

Don't comment out the nuxPrologue/Epilogue functions if building
USE_MODERN_COMPIZ_GL. They are critical functions and commenting them out
causes serious rendering bugs: (LP: #1036528) (LP: #1037949)

Description of the change

Don't comment out the nuxPrologue/Epilogue functions if building
USE_MODERN_COMPIZ_GL. They are critical functions and commenting them out
causes serious rendering bugs: (LP: #1036528) (LP: #1037949)

To post a comment you must log in.
Daniel van Vugt (vanvugt) wrote :

Yes, I am assuming we don't yet care about supporting multi-monitor or the Benchmark plugin on ARM/GLES systems. Yet...

If we do want to support those in future then nuxPrologue/Epilogue will need to be replaced with something else.

Sam Spilsbury (smspillaz) :
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/unityshell.cpp'
2--- plugins/unityshell/src/unityshell.cpp 2012-08-16 13:35:30 +0000
3+++ plugins/unityshell/src/unityshell.cpp 2012-08-17 08:50:57 +0000
4@@ -479,7 +479,7 @@
5
6 void UnityScreen::nuxPrologue()
7 {
8-#ifndef USE_MODERN_COMPIZ_GL
9+#ifndef USE_GLES
10 /* Vertex lighting isn't used in Unity, we disable that state as it could have
11 * been leaked by another plugin. That should theoretically be switched off
12 * right after PushAttrib since ENABLE_BIT is meant to restore the LIGHTING
13@@ -512,8 +512,10 @@
14
15 void UnityScreen::nuxEpilogue()
16 {
17+#ifndef USE_GLES
18 #ifndef USE_MODERN_COMPIZ_GL
19 (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, _active_fbo);
20+#endif
21
22 glMatrixMode(GL_PROJECTION);
23 glLoadIdentity();