Merge lp:~jaytaoko/unity/unity-linaro-merge into lp:unity

[Jay Taoko]

Test the difference with Unity trunk

Unmerged revisions

1814. By Jay Taoko on 2012-01-05

* Merge Linaro's Unity branch with Unity trunk. This branch as the effect of porting the Linaro's branch to Unity 5.0.
* This branch needs Linaro's version of Compiz to build.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-12-14 17:17:34 +0000
+++ CMakeLists.txt	2012-01-09 12:10:36 +0000
@@ -136,6 +136,10 @@
 add_subdirectory(guides)
 add_subdirectory(standalone-clients EXCLUDE_FROM_ALL)
 
+if (USE_GLES)
+  SET (MAINTAINER_CFLAGS ${MAINTAINER_CFLAGS} " -DNUX_OPENGLES_20 -DUSE_GLES")
+endif (USE_GLES)
+
 #
 # GSettings Schema
 #

=== modified file 'plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp'
--- plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2011-12-23 07:19:07 +0000
+++ plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp	2012-01-09 12:10:36 +0000
@@ -438,13 +438,13 @@
 
 bool
 UnityMTGrabHandlesWindow::glDraw(const GLMatrix&            transform,
-                                 GLFragment::Attrib&      fragment,
+                                 const GLWindowPaintAttrib& attrib,
                                  const CompRegion&          region,
-                                 unsigned int              mask)
+                                 unsigned int               mask)
 {
   /* Draw the window on the bottom, we will be drawing the
    * handles on top */
-  bool status = gWindow->glDraw(transform, fragment, region, mask);
+  bool status = gWindow->glDraw(transform, attrib, region, mask);
 
   if (mHandles && mHandles->visible())
   {
@@ -467,7 +467,7 @@
 
         /* We can reset the window geometry since it will be
          * re-added later */
-        gWindow->geometry().reset();
+        gWindow->vertexBuffer()->begin();
 
         /* Not sure what this does, but it is necessary
          * (adjusts for scale?) */
@@ -483,23 +483,21 @@
          * dim (so we get a nice render for things like
          * wobbly etc etc */
         gWindow->glAddGeometry(matl, reg, paintRegion);
+        gWindow->vertexBuffer()->end();
 
-        /* Did it succeed? */
-        if (gWindow->geometry().vertices)
-        {
-          fragment.setOpacity(mHandles->opacity());
-          /* Texture rendering set-up */
-          us->gScreen->setTexEnvMode(GL_MODULATE);
-          glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-          /* Draw the dim texture with all of it's modified
-           * geometry glory */
-          gWindow->glDrawTexture(tex, fragment, mask | PAINT_WINDOW_BLEND_MASK
-                                 | PAINT_WINDOW_TRANSLUCENT_MASK |
-                                 PAINT_WINDOW_TRANSFORMED_MASK);
-          /* Texture rendering tear-down */
-          glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-          us->gScreen->setTexEnvMode(GL_REPLACE);
-        }
+        wAttrib.opacity = mHandles->opacity();
+        /* Texture rendering set-up */
+//        us->gScreen->setTexEnvMode(GL_MODULATE);
+        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        /* Draw the dim texture with all of it's modified
+         * geometry glory */
+        gWindow->glDrawTexture(tex, transform, wAttrib, mask
+                                               | PAINT_WINDOW_BLEND_MASK
+                                               | PAINT_WINDOW_TRANSLUCENT_MASK
+                                               | PAINT_WINDOW_TRANSFORMED_MASK);
+        /* Texture rendering tear-down */
+        glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+        us->gScreen->setTexEnvMode(GL_REPLACE);
       }
 
       handle++;

=== modified file 'plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h'
--- plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h	2011-12-22 12:55:41 +0000
+++ plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h	2012-01-09 12:10:36 +0000
@@ -229,7 +229,7 @@
   void moveNotify(int dx, int dy, bool immediate);
 
   bool glDraw(const GLMatrix&,
-              GLFragment::Attrib&,
+              const GLWindowPaintAttrib&,
               const CompRegion&,
               unsigned int);
 

=== modified file 'plugins/unitydialog/src/unitydialog.cpp'
--- plugins/unitydialog/src/unitydialog.cpp	2011-08-29 04:19:10 +0000
+++ plugins/unitydialog/src/unitydialog.cpp	2012-01-09 12:10:36 +0000
@@ -419,9 +419,10 @@
 
 /* Collect textures */
 void
-UnityDialogWindow::glDrawTexture(GLTexture*          texture,
-                                 GLFragment::Attrib& fa,
-                                 unsigned int       mask)
+UnityDialogWindow::glDrawTexture(GLTexture                 *texture,
+                                 const GLMatrix            &transform,
+                                 const GLWindowPaintAttrib &attrib,
+                                 unsigned int              mask)
 {
   unity::PaintInfoCollector::Active ()->processTexture (texture);
 }
@@ -448,7 +449,7 @@
 {
   /* We can reset the window geometry since it will be
    * re-added later */
-  GLWindow::get (w)->geometry().reset();
+  GLWindow::get (w)->vertexBuffer()->begin();
 
   for (unsigned int i = 0; i < collectedMatrixLists.size (); i++)
   {
@@ -462,6 +463,8 @@
      * wobbly etc etc */
     GLWindow::get (w)->glAddGeometry(matl, reg, paintRegion, min, max);
   }
+
+  GLWindow::get (w)->vertexBuffer()->end();
 }
 
 void
@@ -497,7 +500,9 @@
 }
 
 void
-unity::TexGeometryCollection::addGeometriesAndDrawTextureForWindow(CompWindow *w, unsigned int mask)
+unity::TexGeometryCollection::addGeometriesAndDrawTextureForWindow(CompWindow     *w,
+                                                                   const GLMatrix &transform,
+                                                                   unsigned int    mask)
 {
   if (mTexture && mGeometries.status ())
   {
@@ -509,25 +514,23 @@
 
     mGeometries.addGeometryForWindow (w, paintRegion);
 
-    if (gWindow->geometry().vertices)
-    {
-	UnityDialogScreen *uds = UnityDialogScreen::get (screen);
-	GLFragment::Attrib fa (gWindow->lastPaintAttrib());
-	unsigned int glDrawTextureIndex = gWindow->glDrawTextureGetCurrentIndex();
-	/* Texture rendering set-up */
-	uds->gScreen->setTexEnvMode(GL_MODULATE);
-	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	/* Draw the dim texture with all of it's modified
-	   * geometry glory */
-	gWindow->glDrawTextureSetCurrentIndex(MAXSHORT);
-	gWindow->glDrawTexture(mTexture, fa, mask | PAINT_WINDOW_BLEND_MASK
-			       | PAINT_WINDOW_TRANSLUCENT_MASK |
-			       PAINT_WINDOW_TRANSFORMED_MASK);
-	gWindow->glDrawTextureSetCurrentIndex(glDrawTextureIndex);
-	/* Texture rendering tear-down */
-	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	uds->gScreen->setTexEnvMode(GL_REPLACE);
-    }
+    UnityDialogScreen *uds = UnityDialogScreen::get (screen);
+    GLWindowPaintAttrib attrib (gWindow->lastPaintAttrib());
+    unsigned int glDrawTextureIndex = gWindow->glDrawTextureGetCurrentIndex();
+    /* Texture rendering set-up */
+//    uds->gScreen->setTexEnvMode(GL_MODULATE);
+    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    /* Draw the dim texture with all of it's modified
+     * geometry glory */
+    gWindow->glDrawTextureSetCurrentIndex(MAXSHORT);
+    gWindow->glDrawTexture(mTexture, transform, attrib, mask
+					      | PAINT_WINDOW_BLEND_MASK
+					      | PAINT_WINDOW_TRANSLUCENT_MASK
+					      | PAINT_WINDOW_TRANSFORMED_MASK);
+    gWindow->glDrawTextureSetCurrentIndex(glDrawTextureIndex);
+    /* Texture rendering tear-down */
+    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    uds->gScreen->setTexEnvMode(GL_REPLACE);
   }
 }
 
@@ -581,10 +584,12 @@
 }
 
 void
-unity::PaintInfoCollector::drawGeometriesForWindow(CompWindow *w, unsigned int pm)
+unity::PaintInfoCollector::drawGeometriesForWindow(CompWindow     *w,
+						   const GLMatrix &transform,
+                                                   unsigned int    pm)
 {
   for (unity::TexGeometryCollection &tcg : mCollection)
-    tcg.addGeometriesAndDrawTextureForWindow (w, pm);
+    tcg.addGeometriesAndDrawTextureForWindow (w, transform, pm);
 }
 
 unity::PaintInfoCollector * unity::PaintInfoCollector::active_collector = NULL;
@@ -599,18 +604,18 @@
 
 bool
 UnityDialogWindow::glDraw(const GLMatrix& transform,
-                          GLFragment::Attrib& fragment,
+                          const GLWindowPaintAttrib& attrib,
                           const CompRegion& region,
                           unsigned int mask)
 {
   /* We want to set the geometry of the dim to the window
    * region */
   CompRegion reg = CompRegion(window->x(), window->y(), window->width(), window->height());
-  CompRegion        paintRegion(region);
+  CompRegion paintRegion(region);
 
   /* Draw the window on the bottom, we will be drawing the
    * dim render on top */
-  bool status = gWindow->glDraw(transform, fragment, region, mask);
+  bool status = gWindow->glDraw(transform, attrib, region, mask);
 
   UNITY_DIALOG_SCREEN(screen);
 
@@ -618,10 +623,11 @@
   {
     GLTexture::MatrixList matl;
     GLTexture::Matrix     mat = tex->matrix();
+    GLWindowPaintAttrib   wAttrib(attrib);
 
     /* We can reset the window geometry since it will be
      * re-added later */
-    gWindow->geometry().reset();
+    gWindow->vertexBuffer()->begin();
 
     /* Scale the dim render by the ratio of dim size
      * to window size */
@@ -642,26 +648,24 @@
      * dim (so we get a nice render for things like
      * wobbly etc etc */
     gWindow->glAddGeometry(matl, reg, paintRegion);
+    gWindow->vertexBuffer()->end();
 
-    /* Did it succeed? */
-    if (gWindow->geometry().vertices)
-    {
-      unsigned int glDrawTextureIndex = gWindow->glDrawTextureGetCurrentIndex();
-      fragment.setOpacity(mShadeProgress);
-      /* Texture rendering set-up */
-      uds->gScreen->setTexEnvMode(GL_MODULATE);
-      glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-      /* Draw the dim texture with all of it's modified
-       * geometry glory */
-      gWindow->glDrawTextureSetCurrentIndex(MAXSHORT);
-      gWindow->glDrawTexture(tex, fragment, mask | PAINT_WINDOW_BLEND_MASK
-                             | PAINT_WINDOW_TRANSLUCENT_MASK |
-                             PAINT_WINDOW_TRANSFORMED_MASK);
-      gWindow->glDrawTextureSetCurrentIndex(glDrawTextureIndex);
-      /* Texture rendering tear-down */
-      glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-      uds->gScreen->setTexEnvMode(GL_REPLACE);
-    }
+    unsigned int glDrawTextureIndex = gWindow->glDrawTextureGetCurrentIndex();
+    wAttrib.opacity = mShadeProgress;
+    /* Texture rendering set-up */
+//    uds->gScreen->setTexEnvMode(GL_MODULATE);
+    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    /* Draw the dim texture with all of it's modified
+     * geometry glory */
+    gWindow->glDrawTextureSetCurrentIndex(MAXSHORT);
+    gWindow->glDrawTexture(tex, transform, attrib, mask
+                                              | PAINT_WINDOW_BLEND_MASK
+                                              | PAINT_WINDOW_TRANSLUCENT_MASK
+                                              | PAINT_WINDOW_TRANSFORMED_MASK);
+    gWindow->glDrawTextureSetCurrentIndex(glDrawTextureIndex);
+    /* Texture rendering tear-down */
+    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    uds->gScreen->setTexEnvMode(GL_REPLACE);
   }
 
   for (CompWindow* w : mTransients)
@@ -674,7 +678,7 @@
       unity::PaintInfoCollector pc (w);
 
       pc.collect();
-      pc.drawGeometriesForWindow (window, mask);
+      pc.drawGeometriesForWindow (window, transform, mask);
     }
   }
 

=== modified file 'plugins/unitydialog/src/unitydialog.h'
--- plugins/unitydialog/src/unitydialog.h	2011-08-29 04:19:10 +0000
+++ plugins/unitydialog/src/unitydialog.h	2012-01-09 12:10:36 +0000
@@ -64,7 +64,9 @@
 			int                         max);
       void setTexture (GLTexture *);
 
-      void addGeometriesAndDrawTextureForWindow (CompWindow *, unsigned int pm);
+      void addGeometriesAndDrawTextureForWindow (CompWindow     *w,
+						 const GLMatrix &transform,
+                                                 unsigned int    mask);
 
     private:
       GLTexture*         mTexture;
@@ -78,7 +80,9 @@
       PaintInfoCollector (CompWindow *w);
 
       void collect ();
-      void drawGeometriesForWindow (CompWindow *w, unsigned int pm);
+      void drawGeometriesForWindow (CompWindow     *w,
+				    const GLMatrix &transform,
+				    unsigned int    pm);
 
       void processGeometry (const GLTexture::MatrixList &ml,
 			    const CompRegion            &r,
@@ -242,7 +246,7 @@
 public:
 
   bool
-  glDraw(const GLMatrix&, GLFragment::Attrib&,
+  glDraw(const GLMatrix&, const GLWindowPaintAttrib&,
          const CompRegion&, unsigned int);
 
   bool
@@ -258,7 +262,8 @@
 
   void
   glDrawTexture(GLTexture* texture,
-                GLFragment::Attrib& attrib,
+                const GLMatrix& transform,
+                const GLWindowPaintAttrib& attrib,
                 unsigned int mask);
 
 
@@ -303,17 +308,17 @@
   void    moveTransientsToRect(CompWindow* skip, CompRect rect, bool);
   void    moveParentToRect(CompWindow* requestor, CompRect rect, bool);
 
-  void      moveToRect(CompRect currentRect, bool sync);
+  void    moveToRect(CompRect currentRect, bool sync);
 
   void    grabTransients(CompWindow* skip, int x, int y,
                          unsigned int state, unsigned int mask, bool);
   void    grabParent(CompWindow* requestor, int x, int y,
                      unsigned int state, unsigned int mask, bool);
 
-  void      animateTransients(CompWindow* skip, CompPoint& orig, CompPoint& dest, bool cont);
+  void    animateTransients(CompWindow* skip, CompPoint& orig, CompPoint& dest, bool cont);
   void    animateParent(CompWindow* requestor, CompPoint& orig, CompPoint& dest);
 
-  void      setMaxConstrainingAreas();
+  void    setMaxConstrainingAreas();
 
   CompWindow* transientParent();
 

=== modified file 'plugins/unityshell/src/IconRenderer.cpp'
--- plugins/unityshell/src/IconRenderer.cpp	2012-01-04 01:43:15 +0000
+++ plugins/unityshell/src/IconRenderer.cpp	2012-01-09 12:10:36 +0000
@@ -38,6 +38,17 @@
 {
 namespace ui
 {
+#ifndef NUX_OPENGLES_20
+  #define VertexShaderHeader "#version 110               \n"
+#else
+  #define VertexShaderHeader "#version 100               \n"
+#endif
+
+#ifndef NUX_OPENGLES_20
+  #define FragmentShaderHeader "#version 110               \n"
+#else
+  #define FragmentShaderHeader "#version 100\n precision mediump float;\n"
+#endif
 
 /*
   Use this shader to pass vertices in screen coordinates in the C++ code and compute use
@@ -60,9 +71,9 @@
 #define LUMIN_BLUE "0.055"
 
 nux::NString gPerspectiveCorrectShader = TEXT(
-"[Vertex Shader]                                    \n\
-#version 120                                        \n\
-uniform mat4 ViewProjectionMatrix;                  \n\
+"[Vertex Shader]                                    \n"
+VertexShaderHeader
+"uniform mat4 ViewProjectionMatrix;                 \n\
                                                     \n\
 attribute vec4 iTexCoord0;                          \n\
 attribute vec4 iVertex;                             \n\
@@ -75,9 +86,9 @@
     gl_Position =  ViewProjectionMatrix * iVertex;  \n\
 }                                                   \n\
                                                     \n\
-[Fragment Shader]                                   \n\
-#version 110                                        \n\
-                                                    \n\
+[Fragment Shader]                                   \n"
+FragmentShaderHeader
+"                                                   \n\
 varying vec4 varyTexCoord0;                         \n\
                                                     \n\
 uniform sampler2D TextureObject0;                   \n\
@@ -649,8 +660,8 @@
     // Perspective correct
     v0.x, v0.y, 0.0f, 1.0f,     s0 / v0.w, t0 / v0.w, 0.0f, 1.0f / v0.w,
     v1.x, v1.y, 0.0f, 1.0f,     s1 / v1.w, t1 / v1.w, 0.0f, 1.0f / v1.w,
+    v3.x, v3.y, 0.0f, 1.0f,     s3 / v3.w, t3 / v3.w, 0.0f, 1.0f / v3.w,
     v2.x, v2.y, 0.0f, 1.0f,     s2 / v2.w, t2 / v2.w, 0.0f, 1.0f / v2.w,
-    v3.x, v3.y, 0.0f, 1.0f,     s3 / v3.w, t3 / v3.w, 0.0f, 1.0f / v3.w,
   };
 
   CHECKGL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, 0));
@@ -683,6 +694,7 @@
   }
   else
   {
+#ifndef USE_GLES
     local::asm_shader->Begin();
 
     VertexLocation        = nux::VTXATTRIB_POSITION;
@@ -697,6 +709,7 @@
     // Set the projection matrix
     CHECKGL(glMatrixMode(GL_PROJECTION));
     CHECKGL(glLoadMatrixf((float*) GfxContext.GetOpenGLProjectionMatrix().m));
+#endif
   }
 
   CHECKGL(glEnableVertexAttribArrayARB(VertexLocation));
@@ -716,15 +729,17 @@
     CHECKGL(glUniform4fARB(DesatFactor, arg.saturation, arg.saturation, arg.saturation, arg.saturation));
 
     nux::GetWindowThread()->GetGraphicsEngine().SetTexture(GL_TEXTURE0, icon);
-    CHECKGL(glDrawArrays(GL_QUADS, 0, 4));
+    CHECKGL(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
   }
   else
   {
+#ifndef USE_GLES
     CHECKGL(glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 0, bg_color.red, bg_color.green, bg_color.blue, bg_color.alpha));
     CHECKGL(glProgramLocalParameter4fARB(GL_FRAGMENT_PROGRAM_ARB, 1, arg.saturation, arg.saturation, arg.saturation, arg.saturation));
 
     nux::GetWindowThread()->GetGraphicsEngine().SetTexture(GL_TEXTURE0, icon);
-    CHECKGL(glDrawArrays(GL_QUADS, 0, 4));
+    CHECKGL(glDrawArrays(GL_TRIANGLE_STRIP, 0, 4));
+#endif
   }
 
   if (VertexLocation != -1)

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-01-06 04:53:09 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-01-09 12:10:36 +0000
@@ -113,20 +113,25 @@
   , damaged(false)
   , _key_nav_mode_requested(false)
   , _last_output(nullptr)
+<<<<<<< TREE
   , _active_fbo (0)
+=======
+>>>>>>> MERGE-SOURCE
   , dash_is_open_ (false)
   , grab_index_ (0)
   , painting_tray_ (false)
 {
   Timer timer;
-  gfloat version;
-  gchar* extensions;
   bool  failed = false;
   configure_logging();
   LOG_DEBUG(logger) << __PRETTY_FUNCTION__;
   int (*old_handler)(Display*, XErrorEvent*);
   old_handler = XSetErrorHandler(NULL);
 
+#ifndef USE_GLES
+  gfloat version;
+  gchar* extensions;
+
   /* Ensure OpenGL version is 1.4+. */
   version = get_opengl_version_f32((const gchar*) glGetString(GL_VERSION));
   if (version < 1.4f)
@@ -182,6 +187,7 @@
       failed = true;
     }
   }
+#endif
 
   if (!failed)
   {
@@ -199,16 +205,25 @@
      CompositeScreenInterface::setHandler(cScreen);
      GLScreenInterface::setHandler(gScreen);
 
+     gScreen->glPaintCompositedOutputSetEnabled (this, true);
+
      PluginAdapter::Initialize(screen);
      WindowManager::SetDefault(PluginAdapter::Default());
 
      StartupNotifyService::Default()->SetSnDisplay(screen->snDisplay(), screen->screenNum());
 
      nux::NuxInitialize(0);
+     #ifdef USE_GLES
+     wt = nux::CreateFromForeignWindow(cScreen->output(),
+				       eglGetCurrentContext(),
+				       &UnityScreen::initUnity,
+				       this);
+     #else
      wt = nux::CreateFromForeignWindow(cScreen->output(),
 				       glXGetCurrentContext(),
 				       &UnityScreen::initUnity,
 				       this);
+     #endif
 
      wt->RedrawRequested.connect(sigc::mem_fun(this, &UnityScreen::onRedrawRequested));
 
@@ -226,6 +241,7 @@
      _edge_timeout = optionGetLauncherRevealEdgeTimeout ();
      _in_paint = false;
 
+<<<<<<< TREE
     void *dlhand = dlopen ("libunityshell.so", RTLD_LAZY);
 
     if (dlhand)
@@ -243,6 +259,8 @@
        uScreen->_fbo->onScreenSizeChanged (geometry);
      }
 
+=======
+>>>>>>> MERGE-SOURCE
      optionSetBackgroundColorNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetLauncherHideModeNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetBacklightModeNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -312,8 +330,8 @@
      g_idle_add_full (G_PRIORITY_DEFAULT, &UnityScreen::initPluginActions, this, NULL);
      super_keypressed_ = false;
 
-     GeisAdapter::Default()->Run();
-     gestureEngine = new GestureEngine(screen);
+//     GeisAdapter::Default()->Run();
+//     gestureEngine = new GestureEngine(screen);
 
      CompString name(PKGDATADIR"/panel-shadow.png");
      CompString pname("unityshell");
@@ -437,6 +455,7 @@
 
 void UnityScreen::nuxPrologue()
 {
+  #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
@@ -453,34 +472,40 @@
 
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
+  #endif
 
   glGetError();
 }
 
 void UnityScreen::nuxEpilogue()
 {
+<<<<<<< TREE
   (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, _active_fbo);
+=======
+//  (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, 0);
+>>>>>>> MERGE-SOURCE
 
+  #ifdef USE_GLES
+  glDepthRangef(0, 1);
+  #else
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();
   glDepthRange(0, 1);
-  glViewport(-1, -1, 2, 2);
   glRasterPos2f(0, 0);
 
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix();
+  glMatrixMode(GL_MODELVIEW);
+  glPopMatrix();
+
+  glPopAttrib();
+  #endif
+
+  //glViewport(-1, -1, 2, 2);
   gScreen->resetRasterPos();
 
-  glMatrixMode(GL_PROJECTION);
-  glPopMatrix();
-  glMatrixMode(GL_MODELVIEW);
-  glPopMatrix();
-
-  glDrawBuffer(GL_BACK);
-  glReadBuffer(GL_BACK);
-
-  glPopAttrib();
-
   glDisable(GL_SCISSOR_TEST);
 }
 
@@ -494,6 +519,8 @@
 
 void UnityScreen::paintPanelShadow(const GLMatrix& matrix)
 {
+  return;
+
   if (relayoutSourceId > 0)
     return;
 
@@ -523,33 +550,50 @@
   {
     foreach(GLTexture * tex, _shadow_texture)
     {
-      glEnable(GL_BLEND);
-      glColor4f(1.0f, 1.0f, 1.0f, panel_controller_->opacity());
-      glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
-
-      GL::activeTexture(GL_TEXTURE0_ARB);
+      std::vector<GLfloat>  vertexData;
+      std::vector<GLfloat>  textureData;
+      std::vector<GLushort> colorData;
+      GLVertexBuffer       *streamingBuffer = GLVertexBuffer::streamingBuffer();
+      bool                  wasBlend = glIsEnabled(GL_BLEND);
+
+      if (!wasBlend)
+        glEnable(GL_BLEND);
+
+      GL::activeTexture(GL_TEXTURE0);
       tex->enable(GLTexture::Fast);
 
       glTexParameteri(tex->target(), GL_TEXTURE_WRAP_S, GL_REPEAT);
 
-      glBegin(GL_QUADS);
-      {
-        glTexCoord2f(COMP_TEX_COORD_X(tex->matrix(), 0), COMP_TEX_COORD_Y(tex->matrix(), 0));
-        glVertex2f(vc[0], vc[2]);
-
-        glTexCoord2f(COMP_TEX_COORD_X(tex->matrix(), 0), COMP_TEX_COORD_Y(tex->matrix(), h));
-        glVertex2f(vc[0], vc[3]);
-
-        glTexCoord2f(COMP_TEX_COORD_X(tex->matrix(), w), COMP_TEX_COORD_Y(tex->matrix(), h));
-        glVertex2f(vc[1], vc[3]);
-
-        glTexCoord2f(COMP_TEX_COORD_X(tex->matrix(), w), COMP_TEX_COORD_Y(tex->matrix(), 0));
-        glVertex2f(vc[1], vc[2]);
-      }
-      glEnd();
+      colorData = { 0xFFFF, 0xFFFF, 0xFFFF,
+                    (GLushort)(panel_controller_->opacity() * 0xFFFF)
+                  };
+
+      vertexData = {
+        vc[0], vc[2], 0,
+        vc[0], vc[3], 0,
+        vc[1], vc[2], 0,
+        vc[1], vc[3], 0,
+      };
+
+      textureData = {
+        COMP_TEX_COORD_X(tex->matrix(), 0), COMP_TEX_COORD_Y(tex->matrix(), 0),
+        COMP_TEX_COORD_X(tex->matrix(), 0), COMP_TEX_COORD_Y(tex->matrix(), h),
+        COMP_TEX_COORD_X(tex->matrix(), w), COMP_TEX_COORD_Y(tex->matrix(), 0),
+        COMP_TEX_COORD_X(tex->matrix(), w), COMP_TEX_COORD_Y(tex->matrix(), h),
+      };
+
+      streamingBuffer->begin(GL_TRIANGLE_STRIP);
+
+      streamingBuffer->addColors(1, &colorData[0]);
+      streamingBuffer->addVertices(4, &vertexData[0]);
+      streamingBuffer->addTexCoords(0, 4, &textureData[0]);
+
+      streamingBuffer->end();
+      streamingBuffer->render(matrix);
 
       tex->disable();
-      glDisable(GL_BLEND);
+      if (!wasBlend)
+        glDisable(GL_BLEND);
     }
   }
 }
@@ -566,10 +610,12 @@
   wy = y + (last_bound.height - height) / 2;
 }
 
-void UnityScreen::paintDisplay(const CompRegion& region, const GLMatrix& transform, unsigned int mask)
+void UnityScreen::paintDisplay()
 {
+  GLint fboID;
   CompOutput *output = _last_output;
   Window     tray_xid = panel_controller_->GetTrayXid ();
+<<<<<<< TREE
 
   bool was_bound = _fbo->bound ();
   _fbo->unbind ();
@@ -585,18 +631,40 @@
     _fbo->paint (nux::Geometry (output->x (), output->y (), output->width (), output->height ()));
     glPopMatrix ();
   }
+=======
+>>>>>>> MERGE-SOURCE
 
+<<<<<<< TREE
   nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture =
       nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(_fbo->texture(),
                                                                        screen->width (), screen->height(), 1, nux::BITFMT_R8G8B8A8);
 
+=======
+  nuxPrologue();
+
+  nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture = 
+    nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(gScreen->fbo ()->tex ()->name (),
+      output->width(), output->height(), 1, nux::BITFMT_R8G8B8A8);
+>>>>>>> MERGE-SOURCE
   nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_ = device_texture;
 
+<<<<<<< TREE
   nux::Geometry geo = nux::Geometry (0, 0, screen->width (), screen->height ());
   nux::Geometry oGeo = nux::Geometry (output->x (), output->y (), output->width (), output->height ());
+=======
+  nux::Geometry geo = nux::Geometry (output->x (), output->y (),
+                                     output->width (), output->height ());
+>>>>>>> MERGE-SOURCE
   BackgroundEffectHelper::monitor_rect_ = geo;
 
+<<<<<<< TREE
   nuxPrologue();
+=======
+  // Nux renders to the referenceFramebuffer when it's embedded.
+  glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fboID);
+  wt->GetWindowCompositor().SetReferenceFramebuffer(fboID, geo);
+
+>>>>>>> MERGE-SOURCE
   _in_paint = true;
   wt->RenderInterfaceFromForeignCmd (&oGeo);
   _in_paint = false;
@@ -610,36 +678,28 @@
     {
       GLMatrix oTransform;
       UnityWindow  *uTrayWindow = UnityWindow::get (tray);
-      GLFragment::Attrib attrib (uTrayWindow->gWindow->lastPaintAttrib());
+      GLWindowPaintAttrib attrib (uTrayWindow->gWindow->lastPaintAttrib());
       unsigned int oldGlAddGeometryIndex = uTrayWindow->gWindow->glAddGeometryGetCurrentIndex ();
       unsigned int oldGlDrawIndex = uTrayWindow->gWindow->glDrawGetCurrentIndex ();
-      unsigned int oldGlDrawGeometryIndex = uTrayWindow->gWindow->glDrawGeometryGetCurrentIndex ();
 
-      attrib.setOpacity (OPAQUE);
-      attrib.setBrightness (BRIGHT);
-      attrib.setSaturation (COLOR);
+      attrib.opacity = OPAQUE;
+      attrib.brightness = BRIGHT;
+      attrib.saturation = COLOR;
 
       oTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
-      glPushMatrix ();
-      glLoadMatrixf (oTransform.getMatrix ());
-
       painting_tray_ = true;
 
       /* force the use of the core functions */
       uTrayWindow->gWindow->glDrawSetCurrentIndex (MAXSHORT);
-      uTrayWindow->gWindow->glAddGeometrySetCurrentIndex ( MAXSHORT);
-      uTrayWindow->gWindow->glDrawGeometrySetCurrentIndex (MAXSHORT);
+      uTrayWindow->gWindow->glAddGeometrySetCurrentIndex (MAXSHORT);
       uTrayWindow->gWindow->glDraw (oTransform, attrib, infiniteRegion,
 				     PAINT_WINDOW_TRANSFORMED_MASK |
 				     PAINT_WINDOW_BLEND_MASK |
 				     PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK);
-      uTrayWindow->gWindow->glDrawGeometrySetCurrentIndex (oldGlDrawGeometryIndex);
       uTrayWindow->gWindow->glAddGeometrySetCurrentIndex (oldGlAddGeometryIndex);
       uTrayWindow->gWindow->glDrawSetCurrentIndex (oldGlDrawIndex);
       painting_tray_ = false;
-
-      glPopMatrix ();
     }
   }
 
@@ -998,6 +1058,7 @@
 {
   bool ret;
 
+<<<<<<< TREE
   doShellRepaint = true;
   allowWindowPaint = true;
   _last_output = output;
@@ -1013,19 +1074,41 @@
    *   its bind reference so make sure that
    *   you always unbind as much as you bind */
   _fbo->bind (nux::Geometry (output->x (), output->y (), output->width (), output->height ()));
+=======
+  doShellRepaint = true;
+  allowWindowPaint = true;
+  _last_output = output;
+>>>>>>> MERGE-SOURCE
 
-  /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
   ret = gScreen->glPaintOutput(attrib, transform, region, output, mask);
 
+  return ret;
+}
+
+void UnityScreen::glPaintCompositedOutput (const CompRegion &region,
+                                           GLFramebufferObject *fbo,
+                                           unsigned int        mask)
+{
+  bool useFbo = false;
+
   if (doShellRepaint)
-    paintDisplay(region, transform, mask);
+  {
+    oldFbo = fbo->bind ();
+    useFbo = fbo->checkStatus () && fbo->tex ();
+    if (!useFbo) {
+	printf ("bailing from UnityScreen::glPaintCompositedOutput");
+	GLFramebufferObject::rebind (oldFbo);
+	return;
+    }
+    paintDisplay();
+    GLFramebufferObject::rebind (oldFbo);
+  }
 
-  return ret;
+  gScreen->glPaintCompositedOutput(region, fbo, mask);
 }
 
 /* called whenever a plugin needs to paint the entire scene
  * transformed */
-
 void UnityScreen::glPaintTransformedOutput(const GLScreenPaintAttrib& attrib,
                                            const GLMatrix& transform,
                                            const CompRegion& region,
@@ -1034,7 +1117,6 @@
 {
   allowWindowPaint = false;
   gScreen->glPaintTransformedOutput(attrib, transform, region, output, mask);
-
 }
 
 void UnityScreen::preparePaint(int ms)
@@ -1104,7 +1186,7 @@
         PluginAdapter::Default()->OnScreenGrabbed();
       else if (event->xfocus.mode == NotifyUngrab)
         PluginAdapter::Default()->OnScreenUngrabbed();
-      cScreen->damageScreen();  // evil hack
+//      cScreen->damageScreen();  // evil hack
       if (_key_nav_mode_requested)
         launcher.startKeyNavMode();
       _key_nav_mode_requested = false;
@@ -1711,7 +1793,7 @@
  * and if so paint nux and stop us from painting
  * other windows or on top of the whole screen */
 bool UnityWindow::glDraw(const GLMatrix& matrix,
-                         GLFragment::Attrib& attrib,
+                         const GLWindowPaintAttrib& attrib,
                          const CompRegion& region,
                          unsigned int mask)
 {
@@ -1727,7 +1809,7 @@
       {
         if (xwns[i] == id)
         {
-          uScreen->paintDisplay(region, matrix, mask);
+          uScreen->paintDisplay();
           break;
         }
       }
@@ -2203,12 +2285,15 @@
   if (!needsRelayout)
     return;
 
+<<<<<<< TREE
   if (GL::fbo)
   {
     uScreen->_fbo = ScreenEffectFramebufferObject::Ptr (new ScreenEffectFramebufferObject (glXGetProcAddressP, geometry));
     uScreen->_fbo->onScreenSizeChanged (geometry);
   }
 
+=======
+>>>>>>> MERGE-SOURCE
   UScreen *uscreen = UScreen::GetDefault();
   int primary_monitor = uscreen->GetPrimaryMonitor();
   auto geo = uscreen->GetMonitorGeometry(primary_monitor);

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-01-06 04:53:09 +0000
+++ plugins/unityshell/src/unityshell.h	2012-01-09 12:10:36 +0000
@@ -56,7 +56,10 @@
 
 namespace unity
 {
+<<<<<<< TREE
 
+=======
+>>>>>>> MERGE-SOURCE
 class UnityShowdesktopHandler
 {
  public:
@@ -128,7 +131,7 @@
   void nuxEpilogue();
 
   /* nux draw wrapper */
-  void paintDisplay(const CompRegion& region, const GLMatrix& transform, unsigned int mask);
+  void paintDisplay();
   void paintPanelShadow(const GLMatrix& matrix);
 
   void preparePaint (int ms);
@@ -141,7 +144,6 @@
                      const char         *eventName,
                      CompOption::Vector &o);
 
-
   /* paint on top of all windows if we could not find a window
    * to paint underneath */
   bool glPaintOutput(const GLScreenPaintAttrib&,
@@ -149,6 +151,9 @@
                      const CompRegion&,
                      CompOutput*,
                      unsigned int);
+  void glPaintCompositedOutput (const CompRegion    &region,
+                                GLFramebufferObject *fbo,
+                                unsigned int         mask);
 
   /* paint in the special case that the output is transformed */
   void glPaintTransformedOutput(const GLScreenPaintAttrib&,
@@ -290,8 +295,12 @@
 
   unity::BGHash _bghash;
 
+<<<<<<< TREE
   ScreenEffectFramebufferObject::Ptr _fbo;
   GLuint                             _active_fbo;
+=======
+  GLFramebufferObject *oldFbo;
+>>>>>>> MERGE-SOURCE
 
   bool   queryForShader ();
 
@@ -339,7 +348,7 @@
 
   /* basic window draw function */
   bool glDraw(const GLMatrix& matrix,
-              GLFragment::Attrib& attrib,
+              const GLWindowPaintAttrib& attrib,
               const CompRegion& region,
               unsigned intmask);
 

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-12-22 06:27:26 +0000
+++ tests/CMakeLists.txt	2012-01-09 12:10:36 +0000
@@ -88,6 +88,7 @@
   COMMENT "Generating marshallers")
 
 enable_testing()
+
 find_package(GTest)
 # :(
 find_library (GMOCK_LIB gmock)