Merge lp:~linaro-graphics-wg/unity/fix-gles2-build into lp:unity

[Alexandros Frantzis]

Fix compilation with OpenGL ES 2.0.

Fix compilation with OpenGL ES 2.0.

UNBLOCK

[Sam Spilsbury (smspillaz)]

review: Approve

[Unity Merger (unity-merger)]

We wanted the compiz changes without any unity changes, that was part of the deal, but now that the new compiz has been pushed, we had to distro patch with that build. I'm afraid that I have no other choice than accepting this branch in trunk.

=== modified file 'plugins/unityshell/src/OverlayRenderer.cpp'
--- plugins/unityshell/src/OverlayRenderer.cpp	2012-04-05 22:01:14 +0000
+++ plugins/unityshell/src/OverlayRenderer.cpp	2012-04-06 10:40:30 +0000
@@ -181,6 +181,7 @@
 
 void OverlayRendererImpl::RenderInverseMask_ASM(nux::GraphicsEngine& gfx_context, int x, int y, int width, int height, nux::ObjectPtr<nux::IOpenGLBaseTexture> device_texture, nux::TexCoordXForm &texxform, const nux::Color &color)
 {
+#ifndef NUX_OPENGLES_20
   if (!inverse_texture_mask_asm_prog_.IsValid() || !inverse_texture_rect_mask_asm_prog_.IsValid())
   {
     InitASMInverseTextureMaskShader();
@@ -246,6 +247,7 @@
     CHECKGL(glDisableVertexAttribArrayARB(VertexColorLocation));
 
   shader_program->End();
+#endif
 }
 
 void OverlayRendererImpl::InitSlInverseTextureMaskShader()