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

[Daniel van Vugt]

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)

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)

[Daniel van Vugt (vanvugt)]

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

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-16 13:35:30 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-08-17 08:50:57 +0000
@@ -479,7 +479,7 @@
 
 void UnityScreen::nuxPrologue()
 {
-#ifndef USE_MODERN_COMPIZ_GL
+#ifndef USE_GLES
   /* Vertex lighting isn't used in Unity, we disable that state as it could have
    * been leaked by another plugin. That should theoretically be switched off
    * right after PushAttrib since ENABLE_BIT is meant to restore the LIGHTING
@@ -512,8 +512,10 @@
 
 void UnityScreen::nuxEpilogue()
 {
+#ifndef USE_GLES
 #ifndef USE_MODERN_COMPIZ_GL
   (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, _active_fbo);
+#endif
 
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();