Merge lp:~vanvugt/mir/fix-1378706 into lp:mir

[Daniel van Vugt]

demo-shell: Quick fix for when an opaque fullscreen surface is on top.
Make sure the bypass check doesn't get skipped when we need it most
(LP: #1378706)

This is a bit hackish. But the problem and the solution are both
confined to DemoCompositor so I think good to have something that
at least works until we find a more elegant way to demo occlusion
testing of decorations.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1984
http://jenkins.qa.ubuntu.com/job/mir-ci/1826/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2140
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/166
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/166/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1013
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1013/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3076
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14708

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1826/rebuild

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

[Alan Griffiths (alan-griffiths)]

Not a nice hack but OK

review: Approve

=== modified file 'playground/demo-shell/demo_compositor.cpp'
--- playground/demo-shell/demo_compositor.cpp	2014-10-09 09:49:46 +0000
+++ playground/demo-shell/demo_compositor.cpp	2014-10-15 09:39:39 +0000
@@ -81,6 +81,17 @@
         if (renderable->visible() && any_part_drawn)
         {
             renderable_list.push_back(renderable);
+
+            // Fullscreen and opaque? Definitely no embellishment
+            if (renderable->screen_position() == view_area &&
+                renderable->alpha() == 1.0f &&
+                !renderable->shaped() &&
+                renderable->transformation() == glm::mat4())
+            {
+                embellished = false;
+                nonrenderlist_elements = false; // Don't care what's underneath
+            }
+
             it->rendered_in(this);
         }
         else