Merge lp:~vanvugt/mir/fix-1215285 into lp:~mir-team/mir/trunk

[Daniel van Vugt]

eglplasma: Don't include the alpha component in gradient calculations. We
want the whole surface to be opaque. (LP: #1215285)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:995
http://jenkins.qa.ubuntu.com/job/mir-ci/1351/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/1808
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/1693
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/589
        deb: http://jenkins.qa.ubuntu.com/job/mir-saucy-amd64-ci/589/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

OK

review: Approve

=== modified file 'examples/eglplasma.c'
--- examples/eglplasma.c	2013-07-04 09:32:09 +0000
+++ examples/eglplasma.c	2013-08-22 06:20:07 +0000
@@ -63,12 +63,12 @@
         "precision mediump float;                                \n"
         "uniform float theta;                                    \n"
         "varying vec2 texcoord;                                  \n"
-        "uniform vec4 low_color, high_color;                     \n"
+        "uniform vec3 low_color, high_color;                     \n"
         "                                                        \n"
-        "vec4 gradient(float x)                                  \n"
+        "vec3 gradient(float x)                                  \n"
         "{                                                       \n"
-        "    vec4 col;                                           \n"
-        "    const vec4 white = vec4(1.0, 1.0, 1.0, 1.0);        \n"
+        "    vec3 col;                                           \n"
+        "    const vec3 white = vec3(1.0, 1.0, 1.0);             \n"
         "    if (x < 0.333)                                      \n"
         "        col = x * low_color / 0.333;                    \n"
         "    else if (x < 0.666)                                 \n"
@@ -95,7 +95,7 @@
         "                cos(1.7 * v * cos(2.0 * t))             \n"
         "               ) / 3.0;                                 \n"
         "    float x = (us * vs + 1.0) / 2.0;                    \n"
-        "    gl_FragColor = gradient(x);                         \n"
+        "    gl_FragColor = vec4(gradient(x), 1.0);              \n"
         "}                                                       \n";
 
     const GLfloat vertices[] =
@@ -141,8 +141,8 @@
     low_color = glGetUniformLocation(prog, "low_color");
     high_color = glGetUniformLocation(prog, "high_color");
     theta = glGetUniformLocation(prog, "theta");
-    glUniform4f(low_color, DARK_AUBERGINE, 1.0f);
-    glUniform4f(high_color, ORANGE, 1.0f);
+    glUniform3f(low_color, DARK_AUBERGINE);
+    glUniform3f(high_color, ORANGE);
 
     glVertexAttribPointer(vpos, 2, GL_FLOAT, GL_FALSE, 0, vertices);
     glEnableVertexAttribArray(0);