1
=== modified file 'src/Ubuntu/Components/plugin/plugin.pri'
2
--- src/Ubuntu/Components/plugin/plugin.pri	2015-08-12 09:54:40 +0000
3
+++ src/Ubuntu/Components/plugin/plugin.pri	2015-08-19 13:59:00 +0000
4
@@ -143,5 +143,7 @@
5
143
OTHER_FILES += \
143
OTHER_FILES += \
6
144
    $$PWD/shaders/shape.vert \
144
    $$PWD/shaders/shape.vert \
7
145
    $$PWD/shaders/shape.frag \
145
    $$PWD/shaders/shape.frag \
8
146
    $$PWD/shaders/shape_no_dfdy.frag \
9
146
    $$PWD/shaders/shapeoverlay.vert \
147
    $$PWD/shaders/shapeoverlay.vert \
11
147
    $$PWD/shaders/shapeoverlay.frag
148
    $$PWD/shaders/shapeoverlay.frag \
12
149
    $$PWD/shaders/shapeoverlay_no_dfdy.frag
13
148
150
14
=== modified file 'src/Ubuntu/Components/plugin/plugin.qrc'
15
--- src/Ubuntu/Components/plugin/plugin.qrc	2014-12-01 19:26:16 +0000
16
+++ src/Ubuntu/Components/plugin/plugin.qrc	2015-08-19 13:59:00 +0000
17
@@ -1,8 +1,10 @@
18
1
<RCC>
1
<RCC>
19
2
    <qresource prefix="/uc">
2
    <qresource prefix="/uc">
20
3
        <file>shaders/shape.frag</file>
3
        <file>shaders/shape.frag</file>
21
4
	<file>shaders/shape_no_dfdy.frag</file>
22
4
        <file>shaders/shape.vert</file>
5
        <file>shaders/shape.vert</file>
23
5
        <file>shaders/shapeoverlay.frag</file>
6
        <file>shaders/shapeoverlay.frag</file>
24
7
	<file>shaders/shapeoverlay_no_dfdy.frag</file>
25
6
        <file>shaders/shapeoverlay.vert</file>
8
        <file>shaders/shapeoverlay.vert</file>
26
7
    </qresource>
9
    </qresource>
27
8
</RCC>
10
</RCC>
28
9
11
29
=== added file 'src/Ubuntu/Components/plugin/shaders/shape_no_dfdy.frag'
30
--- src/Ubuntu/Components/plugin/shaders/shape_no_dfdy.frag	1970-01-01 00:00:00 +0000
31
+++ src/Ubuntu/Components/plugin/shaders/shape_no_dfdy.frag	2015-08-19 13:59:00 +0000
32
@@ -0,0 +1,112 @@
33
1
// Copyright © 2015 Canonical Ltd.
34
2
//
35
3
// This program is free software; you can redistribute it and/or modify
36
4
// it under the terms of the GNU Lesser General Public License as published by
37
5
// the Free Software Foundation; version 3.
38
6
//
39
7
// This program is distributed in the hope that it will be useful,
40
8
// but WITHOUT ANY WARRANTY; without even the implied warranty of
41
9
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
42
10
// GNU Lesser General Public License for more details.
43
11
//
44
12
// You should have received a copy of the GNU Lesser General Public License
45
13
// along with this program.  If not, see <http://www.gnu.org/licenses/>.
46
14
//
47
15
// Author: Loïc Molinari <loic.molinari@canonical.com>
48
16
49
17
// Static flow control (branching on a uniform value) is fast on most GPUs (including ultra-low
50
18
// power ones) because it allows to use the same shader execution path for an entire draw call. We
51
19
// rely on that technique here (also known as "uber-shader" solution) to avoid the complexity of
52
20
// dealing with a multiple shaders solution.
53
21
// FIXME(loicm) Validate GPU behavior with regards to static flow control.
54
22
55
23
uniform sampler2D shapeTexture;
56
24
uniform sampler2D sourceTexture;
57
25
uniform lowp vec2 opacityFactors;
58
26
uniform lowp float dfdtFactor;
59
27
uniform lowp float sourceOpacity;
60
28
uniform lowp float distanceAA;
61
29
uniform bool textured;
62
30
uniform mediump int aspect;
63
31
64
32
varying mediump vec2 shapeCoord;
65
33
varying mediump vec4 sourceCoord;
66
34
varying lowp vec4 backgroundColor;
67
35
68
36
const mediump int FLAT        = 0x08;  // 1 << 3
69
37
const mediump int INSET       = 0x10;  // 1 << 4
70
38
const mediump int DROP_SHADOW = 0x20;  // 1 << 5
71
39
72
40
void main(void)
73
41
{
74
42
    lowp vec4 shapeData = texture2D(shapeTexture, shapeCoord);
75
43
    lowp vec4 color = backgroundColor;
76
44
77
45
    // FIXME(loicm) Would be better to use a bitfield but bitwise ops have only been integrated in
78
46
    //     GLSL 1.3 (OpenGL 3) and GLSL ES 3 (OpenGL ES 3).
79
47
    if (textured) {
80
48
        // Blend the source over the current color.
81
49
        // FIXME(loicm) sign() is far from optimal. Call texture2D() at beginning of scope.
82
50
        lowp vec2 axisMask = -sign((sourceCoord.zw * sourceCoord.zw) - vec2(1.0));
83
51
        lowp float mask = clamp(axisMask.x + axisMask.y, 0.0, 1.0);
84
52
        lowp vec4 source = texture2D(sourceTexture, sourceCoord.st) * vec4(sourceOpacity * mask);
85
53
        color = vec4(1.0 - source.a) * color + source;
86
54
    }
87
55
88
56
    // FIXME: Workaround for systems that do not support dFdy()
89
57
    lowp float dfdt = -0.0285;
90
58
91
59
#define NO_DFDY 1
92
60
    // only FLAT aspect is supported when the dFdy function is not available because
93
61
    // dFdy() is used to determine on which side (top or bottom) in the shape we are.
94
62
95
63
#ifndef NO_DFDY
96
64
    if (aspect == FLAT) {
97
65
#endif
98
66
        // Mask the current color with an anti-aliased and resolution independent shape mask built
99
67
        // from distance fields.
100
68
        lowp float distanceMin = abs(dfdt) * -distanceAA + 0.5;
101
69
        lowp float distanceMax = abs(dfdt) * distanceAA + 0.5;
102
70
        color *= smoothstep(distanceMin, distanceMax, shapeData.b);
103
71
#ifndef NO_DFDY
104
72
105
73
    } else if (aspect == INSET) {
106
74
        // The vertex layout of the shape is made so that the derivative is negative from top to
107
75
        // middle and positive from middle to bottom.
108
76
        lowp float shapeSide = dfdt * dfdtFactor <= 0.0 ? 0.0 : 1.0;
109
77
        // Blend the shape inner shadow over the current color. The shadow color is black, its
110
78
        // translucency is stored in the texture.
111
79
        lowp float shadow = shapeData[int(shapeSide)];
112
80
        color = vec4(1.0 - shadow) * color + vec4(0.0, 0.0, 0.0, shadow);
113
81
        // Get the anti-aliased and resolution independent shape mask using distance fields.
114
82
        lowp float distanceMin = abs(dfdt) * -distanceAA + 0.5;
115
83
        lowp float distanceMax = abs(dfdt) * distanceAA + 0.5;
116
84
        lowp vec2 mask = smoothstep(distanceMin, distanceMax, shapeData.ba);
117
85
        // Get the bevel color. The bevel is made of the top mask masked with the bottom mask. A
118
86
        // gradient from the bottom (1) to the middle (0) of the shape is used to factor out values
119
87
        // resulting from the mask anti-aliasing. The bevel color is white with 60% opacity.
120
88
        lowp float bevel = (mask.x * -mask.y) + mask.x;  // -ab + a = a(1 - b)
121
89
        lowp float gradient = clamp((shapeSide * -shapeCoord.t) + shapeSide, 0.0, 1.0);
122
90
        bevel *= gradient * 0.6;
123
91
        // Mask the current color then blend the bevel over the resulting color. We simply use
124
92
        // additive blending since the bevel has already been masked.
125
93
        color = (color * vec4(mask[int(shapeSide)])) + vec4(bevel);
126
94
127
95
    } else if (aspect == DROP_SHADOW) {
128
96
        // The vertex layout of the shape is made so that the derivative is negative from top to
129
97
        // middle and positive from middle to bottom.
130
98
        lowp int shapeSide = dfdt * dfdtFactor <= 0.0 ? 0 : 1;
131
99
        // Get the anti-aliased and resolution independent shape mask using distance fields.
132
100
        lowp float distanceMin = abs(dfdt) * -distanceAA + 0.5;
133
101
        lowp float distanceMax = abs(dfdt) * distanceAA + 0.5;
134
102
        lowp float mask = smoothstep(distanceMin, distanceMax, shapeData[shapeSide]);
135
103
        // Get the shadow color outside of the shape mask.
136
104
        lowp float shadow = (shapeData.b * -mask) + shapeData.b;  // -ab + a = a(1 - b)
137
105
        // Mask the current color then blend the shadow over the resulting color. We simply use
138
106
        // additive blending since the shadow has already been masked.
139
107
        color = (color * vec4(mask)) + vec4(0.0, 0.0, 0.0, shadow);
140
108
    }
141
109
#endif
142
110
143
111
    gl_FragColor = color * opacityFactors.xxxy;
144
112
}
145
0
113
146
=== added file 'src/Ubuntu/Components/plugin/shaders/shapeoverlay_no_dfdy.frag'
147
--- src/Ubuntu/Components/plugin/shaders/shapeoverlay_no_dfdy.frag	1970-01-01 00:00:00 +0000
148
+++ src/Ubuntu/Components/plugin/shaders/shapeoverlay_no_dfdy.frag	2015-08-19 13:59:00 +0000
149
@@ -0,0 +1,121 @@
150
1
// Copyright © 2015 Canonical Ltd.
151
2
//
152
3
// This program is free software; you can redistribute it and/or modify
153
4
// it under the terms of the GNU Lesser General Public License as published by
154
5
// the Free Software Foundation; version 3.
155
6
//
156
7
// This program is distributed in the hope that it will be useful,
157
8
// but WITHOUT ANY WARRANTY; without even the implied warranty of
158
9
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
159
10
// GNU Lesser General Public License for more details.
160
11
//
161
12
// You should have received a copy of the GNU Lesser General Public License
162
13
// along with this program.  If not, see <http://www.gnu.org/licenses/>.
163
14
//
164
15
// Author: Loïc Molinari <loic.molinari@canonical.com>
165
16
166
17
// Static flow control (branching on a uniform value) is fast on most GPUs (including ultra-low
167
18
// power ones) because it allows to use the same shader execution path for an entire draw call. We
168
19
// rely on that technique here (also known as "uber-shader" solution) to avoid the complexity of
169
20
// dealing with a multiple shaders solution.
170
21
// FIXME(loicm) Validate GPU behavior with regards to static flow control.
171
22
172
23
uniform sampler2D shapeTexture;
173
24
uniform sampler2D sourceTexture;
174
25
uniform lowp vec2 opacityFactors;
175
26
uniform lowp float dfdtFactor;
176
27
uniform lowp float sourceOpacity;
177
28
uniform lowp float distanceAA;
178
29
uniform bool textured;
179
30
uniform mediump int aspect;
180
31
181
32
varying mediump vec2 shapeCoord;
182
33
varying mediump vec4 sourceCoord;
183
34
varying lowp vec4 backgroundColor;
184
35
varying mediump vec2 overlayCoord;
185
36
varying lowp vec4 overlayColor;
186
37
187
38
const mediump int FLAT  = 0x08;        // 1 << 3
188
39
const mediump int INSET = 0x10;        // 1 << 4
189
40
const mediump int DROP_SHADOW = 0x20;  // 1 << 5
190
41
191
42
void main(void)
192
43
{
193
44
    lowp vec4 shapeData = texture2D(shapeTexture, shapeCoord);
194
45
    lowp vec4 color = backgroundColor;
195
46
196
47
    // FIXME(loicm) Would be better to use a bitfield but bitwise ops have only been integrated in
197
48
    //     GLSL 1.3 (OpenGL 3) and GLSL ES 3 (OpenGL ES 3).
198
49
    if (textured) {
199
50
        // Blend the source over the current color.
200
51
        // FIXME(loicm) sign() is far from optimal. Call texture2D() at beginning of scope.
201
52
        lowp vec2 axisMask = -sign((sourceCoord.zw * sourceCoord.zw) - vec2(1.0));
202
53
        lowp float mask = clamp(axisMask.x + axisMask.y, 0.0, 1.0);
203
54
        lowp vec4 source = texture2D(sourceTexture, sourceCoord.st) * vec4(sourceOpacity * mask);
204
55
        color = vec4(1.0 - source.a) * color + source;
205
56
    }
206
57
207
58
    // Blend the overlay over the current color.
208
59
    // FIXME(loicm) sign() is far from optimal.
209
60
    lowp vec2 overlayAxisMask = -sign((overlayCoord * overlayCoord) - vec2(1.0));
210
61
    lowp float overlayMask = clamp(overlayAxisMask.x + overlayAxisMask.y, 0.0, 1.0);
211
62
    lowp vec4 overlay = overlayColor * vec4(overlayMask);
212
63
    color = vec4(1.0 - overlay.a) * color + overlay;
213
64
214
65
    // FIXME: Workaround for systems that do not support dFdy()
215
66
    lowp float dfdt = -0.0285;
216
67
217
68
#define NO_DFDY 1
218
69
    // only FLAT aspect is supported when the dFdy function is not available because
219
70
    // dFdy() is used to determine on which side (top or bottom) in the shape we are.
220
71
221
72
#ifndef NO_DFDY
222
73
    if (aspect == FLAT) {
223
74
#endif
224
75
        // Mask the current color with an anti-aliased and resolution independent shape mask built
225
76
        // from distance fields.
226
77
        lowp float distanceMin = abs(dfdt) * -distanceAA + 0.5;
227
78
        lowp float distanceMax = abs(dfdt) * distanceAA + 0.5;
228
79
        color *= smoothstep(distanceMin, distanceMax, shapeData.b);
229
80
230
81
#ifndef NO_DFDY
231
82
    } else if (aspect == INSET) {
232
83
        // The vertex layout of the shape is made so that the derivative is negative from top to
233
84
        // middle and positive from middle to bottom.
234
85
        lowp float shapeSide = dfdt * dfdtFactor <= 0.0 ? 0.0 : 1.0;
235
86
        // Blend the shape inner shadow over the current color. The shadow color is black, its
236
87
        // translucency is stored in the texture.
237
88
        lowp float shadow = shapeData[int(shapeSide)];
238
89
        color = vec4(1.0 - shadow) * color + vec4(0.0, 0.0, 0.0, shadow);
239
90
        // Get the anti-aliased and resolution independent shape mask using distance fields.
240
91
        lowp float distanceMin = abs(dfdt) * -distanceAA + 0.5;
241
92
        lowp float distanceMax = abs(dfdt) * distanceAA + 0.5;
242
93
        lowp vec2 mask = smoothstep(distanceMin, distanceMax, shapeData.ba);
243
94
        // Get the bevel color. The bevel is made of the top mask masked with the bottom mask. A
244
95
        // gradient from the bottom (1) to the middle (0) of the shape is used to factor out values
245
96
        // resulting from the mask anti-aliasing. The bevel color is white with 60% opacity.
246
97
        lowp float bevel = (mask.x * -mask.y) + mask.x;  // -ab + a = a(1 - b)
247
98
        lowp float gradient = clamp((shapeSide * -shapeCoord.t) + shapeSide, 0.0, 1.0);
248
99
        bevel *= gradient * 0.6;
249
100
        // Mask the current color then blend the bevel over the resulting color. We simply use
250
101
        // additive blending since the bevel has already been masked.
251
102
        color = (color * vec4(mask[int(shapeSide)])) + vec4(bevel);
252
103
253
104
    } else if (aspect == DROP_SHADOW) {
254
105
        // The vertex layout of the shape is made so that the derivative is negative from top to
255
106
        // middle and positive from middle to bottom.
256
107
        lowp int shapeSide = dfdt * dfdtFactor <= 0.0 ? 0 : 1;
257
108
        // Get the anti-aliased and resolution independent shape mask using distance fields.
258
109
        lowp float distanceMin = abs(dfdt) * -distanceAA + 0.5;
259
110
        lowp float distanceMax = abs(dfdt) * distanceAA + 0.5;
260
111
        lowp float mask = smoothstep(distanceMin, distanceMax, shapeData[shapeSide]);
261
112
        // Get the shadow color outside of the shape mask.
262
113
        lowp float shadow = (shapeData.b * -mask) + shapeData.b;  // -ab + a = a(1 - b)
263
114
        // Mask the current color then blend the shadow over the resulting color. We simply use
264
115
        // additive blending since the shadow has already been masked.
265
116
        color = (color * vec4(mask)) + vec4(0.0, 0.0, 0.0, shadow);
266
117
    }
267
118
#endif
268
119
269
120
    gl_FragColor = color * opacityFactors.xxxy;
270
121
}
271
0
122
272
=== modified file 'src/Ubuntu/Components/plugin/ucubuntushape.cpp'
273
--- src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-06 13:16:24 +0000
274
+++ src/Ubuntu/Components/plugin/ucubuntushape.cpp	2015-08-19 13:59:00 +0000
275
@@ -52,8 +52,17 @@
276
52
52
277
53
ShapeShader::ShapeShader()
53
ShapeShader::ShapeShader()
278
54
{
54
{
279
55
    QOpenGLContext* context = QOpenGLContext::currentContext();
280
55
    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/uc/shaders/shape.vert"));
56
    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/uc/shaders/shape.vert"));
282
56
    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/uc/shaders/shape.frag"));
57
283
58
    if ( context->isOpenGLES() &&
284
59
         !context->hasExtension(QByteArrayLiteral("GL_OES_standard_derivatives")) ) {
285
60
        // dFdy function is not available in fragment shaders
286
61
        qWarning() << "GL_OES_standard_derivatives not available. Using fallback shader for shape.";
287
62
        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/uc/shaders/shape_no_dfdy.frag"));
288
63
    } else {
289
64
        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/uc/shaders/shape.frag"));
290
65
    }
291
57
}
66
}
292
58
67
293
59
char const* const* ShapeShader::attributeNames() const
68
char const* const* ShapeShader::attributeNames() const
294
60
69
295
=== modified file 'src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp'
296
--- src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-04-30 19:51:26 +0000
297
+++ src/Ubuntu/Components/plugin/ucubuntushapeoverlay.cpp	2015-08-19 13:59:00 +0000
298
@@ -26,8 +26,17 @@
299
26
26
300
27
ShapeOverlayShader::ShapeOverlayShader()
27
ShapeOverlayShader::ShapeOverlayShader()
301
28
{
28
{
302
29
    QOpenGLContext* context = QOpenGLContext::currentContext();
303
29
    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/uc/shaders/shapeoverlay.vert"));
30
    setShaderSourceFile(QOpenGLShader::Vertex, QStringLiteral(":/uc/shaders/shapeoverlay.vert"));
305
30
    setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/uc/shaders/shapeoverlay.frag"));
31
306
32
    if ( context->isOpenGLES() &&
307
33
         !context->hasExtension(QByteArrayLiteral("GL_OES_standard_derivatives")) ) {
308
34
        // dFdy function is not available in fragment shaders
309
35
        qWarning() << "GL_OES_standard_derivatives not available. Using fallback shader for shape overlay.";
310
36
        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/uc/shaders/shapeoverlay_no_dfdy.frag"));
311
37
    } else {
312
38
        setShaderSourceFile(QOpenGLShader::Fragment, QStringLiteral(":/uc/shaders/shapeoverlay.frag"));
313
39
    }
314
31
}
40
}
315
32
41
316
33
char const* const* ShapeOverlayShader::attributeNames() const
42
char const* const* ShapeOverlayShader::attributeNames() const
Reviewer	Review Type	Status
PS Jenkins bot	continuous-integration	Approve on 2015-08-19
Tim Peeters		Abstain on 2015-08-19
Review via email: mp+268405@code.launchpad.net