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

[Daniel van Vugt]

demo shell: Keep colours consistent, regardless of the physical pixel
format of your framebuffer (LP: #1375660)

[Alexandros Frantzis (afrantzis)]

I am OK with the change, but was the code like that for a specific reason?

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1942
http://jenkins.qa.ubuntu.com/job/mir-0.8-ci/22/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-0.8-utopic-amd64-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/mir-0.8-utopic-amd64-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1957
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1964
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1907/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/844
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/844/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2924/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13915

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1942
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2825/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1958
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1965
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1908
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1347
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/1347/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/845
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/845/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2925
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13916

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2825/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1942
http://jenkins.qa.ubuntu.com/job/mir-ci/1718/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1956
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1963
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-armhf-ci/56/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Kevin DuBois (kdub)]

lgtm

review: Approve

[Alan Griffiths (alan-griffiths)]

I too am curious why the code was like that.

review: Approve

[Alberto Aguirre (albaguirre)]

Huh? This is premultiplied alpha..

It's should be all 0's....

review: Disapprove

[Alberto Aguirre (albaguirre)]

Well this is the demo shell...It doesn't matter if its background is not transparent.

review: Abstain

[Alberto Aguirre (albaguirre)]

Actually now with qtmir, it doesn't matter for the default renderer either (it used to matter for OSK, etc, to initialize a nested surface to a fully transparent background).

=== modified file 'playground/demo-shell/demo_renderer.cpp'
--- playground/demo-shell/demo_renderer.cpp	2014-09-30 04:37:00 +0000
+++ playground/demo-shell/demo_renderer.cpp	2014-09-30 10:25:53 +0000
@@ -174,10 +174,7 @@
 void DemoRenderer::begin(std::unordered_set<graphics::Renderable::ID> decoration_skip_list_) const
 {
     bool const opaque = destination_alpha() == compositor::DestinationAlpha::opaque;
-    if (opaque)
-        glClearColor(0.2f, 0.2f, 0.2f, 1.0f);
-    else
-        glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+    glClearColor(0.2f, 0.2f, 0.2f, 1.0f);
 
     glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
     glClear(GL_COLOR_BUFFER_BIT);