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

[Daniel van Vugt]

Fixed: Benchmark window was being rendered shrunken, misplaced and frequently
invisible if unity was built with USE_MODERN_COMPIZ_GL. (LP: #1036528)

This was caused by some rather important code being #ifdef'd out incorrectly.

Fixed: Benchmark window was being rendered shrunken, misplaced and frequently
invisible if unity was built with USE_MODERN_COMPIZ_GL. (LP: #1036528)

This was caused by some rather important code being #ifdef'd out incorrectly.

[Sam Spilsbury (smspillaz)]

 +#ifndef USE_GLES
18 #ifndef USE_MODERN_COMPIZ_GL
19 (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, _active_fbo);
20 +#endif

Hmm, are we not binding a default fbo in gles builds of nux ?

review: Needs Information

[Daniel van Vugt (vanvugt)]

Hmm, there might be a case where we want to GL::bindFramebuffer and USE_GLES. That is if we're using the legacy GLES patches instead of USE_MODERN_COMPIZ_GL.

I guess we should support that, though I'm not sure it's necessary any more...

[Sam Spilsbury (smspillaz)]

Okay all good.

Yikes dealing with #ifdefs in launchpad diffs is confusing :(

review: Approve

[Daniel van Vugt (vanvugt)]

I know it's confusing. That's Launchpad bug 917502.

[Unity Merger (unity-merger)]

No commit message specified.

[Daniel van Vugt (vanvugt)]

Fixed commit message (thanks LP for deleting the old one). Re-approved.

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-14 19:27:17 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-08-15 06:31:48 +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
@@ -514,7 +514,8 @@
 {
 #ifndef USE_MODERN_COMPIZ_GL
   (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, _active_fbo);
-
+#endif
+#ifndef USE_GLES
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   glMatrixMode(GL_MODELVIEW);
@@ -539,14 +540,11 @@
    * NVIDIA compatibility reasons */
   glEnableClientState(GL_VERTEX_ARRAY);
   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+  glDepthRange(0, 1);
+  //glViewport(-1, -1, 2, 2);
+  gScreen->resetRasterPos();
 #else
-#ifdef USE_GLES
   glDepthRangef(0, 1);
-#else
-  glDepthRange(0, 1);
-#endif
-  //glViewport(-1, -1, 2, 2);
-  gScreen->resetRasterPos();
 #endif
 
   glDisable(GL_SCISSOR_TEST);