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

[Daniel van Vugt]

Always paint the shell separately per output. Otherwise the logic for
deciding whether the shell should be painted on a given monitor makes no
sense and the shell is often not painted at all. (LP: #1037408)

This also appears to resolve VBO and FBO rendering bugs:
(LP: #1036568) (LP: #1036569)
and Benchmark painting:
(LP: #1036609)

See commit message.

[Daniel van Vugt (vanvugt)]

Also seems to fix bug 1036569 and bug 1036568 !?

[Daniel van Vugt (vanvugt)]

And fixes bug 1036609 !?

[Sam Spilsbury (smspillaz)]

I have no idea why the code was even doing this anyways. +1

review: Approve

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-20 09:53:25 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-08-20 09:53:25 +0000
@@ -209,10 +209,6 @@
      CompositeScreenInterface::setHandler(cScreen);
      GLScreenInterface::setHandler(gScreen);
 
-#ifdef USE_MODERN_COMPIZ_GL
-     gScreen->glPaintCompositedOutputSetEnabled (this, true);
-#endif
-
      PluginAdapter::Initialize(screen);
      WindowManager::SetDefault(PluginAdapter::Default());
      AddChild(PluginAdapter::Default());
@@ -1308,37 +1304,16 @@
   if (doShellRepaint && !force && fullscreenRegion.contains(*output))
     doShellRepaint = false;
 
-#ifndef USE_MODERN_COMPIZ_GL
   if (doShellRepaint)
+#ifdef USE_MODERN_COMPIZ_GL
+    paintDisplay();
+#else
     paintDisplay(region, transform, mask);
 #endif
 
   return ret;
 }
 
-#ifdef USE_MODERN_COMPIZ_GL
-void UnityScreen::glPaintCompositedOutput (const CompRegion &region,
-                                           ::GLFramebufferObject *fbo,
-                                           unsigned int        mask)
-{
-  if (doShellRepaint)
-  {
-    bool useFbo = false;
-    oldFbo = fbo->bind ();
-    useFbo = fbo->checkStatus () && fbo->tex ();
-    if (!useFbo) {
-	printf ("bailing from UnityScreen::glPaintCompositedOutput");
-	::GLFramebufferObject::rebind (oldFbo);
-	return;
-    }
-    paintDisplay();
-    ::GLFramebufferObject::rebind (oldFbo);
-  }
-
-  gScreen->glPaintCompositedOutput(region, fbo, mask);
-}
-#endif
-
 /* called whenever a plugin needs to paint the entire scene
  * transformed */
 

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-08-10 15:11:21 +0000
+++ plugins/unityshell/src/unityshell.h	2012-08-20 09:53:25 +0000
@@ -123,11 +123,6 @@
                      const CompRegion&,
                      CompOutput*,
                      unsigned int);
-#ifdef USE_MODERN_COMPIZ_GL
-  void glPaintCompositedOutput (const CompRegion    &region,
-                                ::GLFramebufferObject *fbo,
-                                unsigned int         mask);
-#endif
 
   /* paint in the special case that the output is transformed */
   void glPaintTransformedOutput(const GLScreenPaintAttrib&,