1
=== modified file 'src/renderers/gl/renderer.cpp'
2
--- src/renderers/gl/renderer.cpp	2016-09-19 04:16:15 +0000
3
+++ src/renderers/gl/renderer.cpp	2016-10-03 16:14:19 +0000
4
@@ -1,4 +1,4 @@
6
1
/* Copyright © 2013 Canonical Ltd.
1
/* Copyright © 2013, 2016 Canonical Ltd.
7
2
 *
2
 *
8
3
 * This program is free software: you can redistribute it and/or modify it
3
 * This program is free software: you can redistribute it and/or modify it
9
4
 * under the terms of the GNU General Public License version 3,
4
 * under the terms of the GNU General Public License version 3,
10
@@ -28,6 +28,7 @@
11
28
#include "mir/gl/texture_cache.h"
28
#include "mir/gl/texture_cache.h"
12
29
#include "mir/gl/texture.h"
29
#include "mir/gl/texture.h"
13
30
#include "mir/log.h"
30
#include "mir/log.h"
14
31
#include "mir/report_exception.h"
15
31
32
16
32
#define GLM_FORCE_RADIANS
33
#define GLM_FORCE_RADIANS
17
33
#include <glm/gtc/matrix_transform.hpp>
34
#include <glm/gtc/matrix_transform.hpp>
18
@@ -287,70 +288,78 @@
19
287
    primitives.clear();
288
    primitives.clear();
20
288
    tessellate(primitives, renderable);
289
    tessellate(primitives, renderable);
21
289
290
77
290
    auto surface_tex = texture_cache->load(renderable);
291
    // if we fail to load the texture, we need to carry on (part of lp:1629275)
78
291
292
    try
79
292
    typedef struct  // Represents parameters of glBlendFuncSeparate()
293
    {
80
293
    {
294
        auto surface_tex = texture_cache->load(renderable);
81
294
        GLenum src_rgb, dst_rgb, src_alpha, dst_alpha;
295
82
295
    } BlendSeparate;
296
        typedef struct  // Represents parameters of glBlendFuncSeparate()
83
296
297
        {
84
297
    BlendSeparate client_blend;
298
            GLenum src_rgb, dst_rgb, src_alpha, dst_alpha;
85
298
299
        } BlendSeparate;
86
299
    // These renderable method names could be better (see LP: #1236224)
300
87
300
    if (renderable.shaped())  // Client is RGBA:
301
        BlendSeparate client_blend;
88
301
    {
302
89
302
        client_blend = {GL_ONE, GL_ONE_MINUS_SRC_ALPHA,
303
        // These renderable method names could be better (see LP: #1236224)
90
303
                        GL_ONE, GL_ONE_MINUS_SRC_ALPHA};
304
        if (renderable.shaped())  // Client is RGBA:
91
304
    }
305
        {
92
305
    else if (renderable.alpha() == 1.0f)  // RGBX and no window translucency:
306
            client_blend = {GL_ONE, GL_ONE_MINUS_SRC_ALPHA,
93
306
    {
307
                            GL_ONE, GL_ONE_MINUS_SRC_ALPHA};
94
307
        client_blend = {GL_ONE,  GL_ZERO,
308
        }
95
308
                        GL_ZERO, GL_ONE};  // Avoid using src_alpha!
309
        else if (renderable.alpha() == 1.0f)  // RGBX and no window translucency:
96
309
    }
310
        {
97
310
    else
311
            client_blend = {GL_ONE,  GL_ZERO,
98
311
    {   // Client is RGBX but we also have window translucency.
312
                            GL_ZERO, GL_ONE};  // Avoid using src_alpha!
44
312
        // The texture alpha channel is possibly uninitialized so we must be
45
313
        // careful and avoid using SRC_ALPHA (LP: #1423462).
46
314
        client_blend = {GL_ONE,  GL_ONE_MINUS_CONSTANT_ALPHA,
47
315
                        GL_ZERO, GL_ONE};
48
316
        glBlendColor(0.0f, 0.0f, 0.0f, renderable.alpha());
49
317
    }
50
318
51
319
    for (auto const& p : primitives)
52
320
    {
53
321
        BlendSeparate blend;
54
322
55
323
        if (p.tex_id == 0)   // The client surface texture
56
324
        {
57
325
            blend = client_blend;
58
326
            surface_tex->bind();
59
327
        }
60
328
        else   // Some other texture from the shell (e.g. decorations) which
61
329
        {      // is always RGBA (valid SRC_ALPHA).
62
330
            blend = {GL_ONE, GL_ONE_MINUS_SRC_ALPHA,
63
331
                     GL_ONE, GL_ONE_MINUS_SRC_ALPHA};
64
332
            glBindTexture(GL_TEXTURE_2D, p.tex_id);
65
333
        }
66
334
67
335
        glVertexAttribPointer(prog.position_attr, 3, GL_FLOAT,
68
336
                              GL_FALSE, sizeof(mgl::Vertex),
69
337
                              &p.vertices[0].position);
70
338
        glVertexAttribPointer(prog.texcoord_attr, 2, GL_FLOAT,
71
339
                              GL_FALSE, sizeof(mgl::Vertex),
72
340
                              &p.vertices[0].texcoord);
73
341
74
342
        if (blend.dst_rgb == GL_ZERO)
75
343
        {
76
344
            glDisable(GL_BLEND);
99
345
        }
313
        }
100
346
        else
314
        else
101
315
        {   // Client is RGBX but we also have window translucency.
102
316
            // The texture alpha channel is possibly uninitialized so we must be
103
317
            // careful and avoid using SRC_ALPHA (LP: #1423462).
104
318
            client_blend = {GL_ONE,  GL_ONE_MINUS_CONSTANT_ALPHA,
105
319
                            GL_ZERO, GL_ONE};
106
320
            glBlendColor(0.0f, 0.0f, 0.0f, renderable.alpha());
107
321
        }
108
322
109
323
        for (auto const& p : primitives)
110
347
        {
324
        {
114
348
            glEnable(GL_BLEND);
325
            BlendSeparate blend;
115
349
            glBlendFuncSeparate(blend.src_rgb,   blend.dst_rgb,
326
116
350
                                blend.src_alpha, blend.dst_alpha);
327
            if (p.tex_id == 0)   // The client surface texture
117
328
            {
118
329
                blend = client_blend;
119
330
                surface_tex->bind();
120
331
            }
121
332
            else   // Some other texture from the shell (e.g. decorations) which
122
333
            {      // is always RGBA (valid SRC_ALPHA).
123
334
                blend = {GL_ONE, GL_ONE_MINUS_SRC_ALPHA,
124
335
                         GL_ONE, GL_ONE_MINUS_SRC_ALPHA};
125
336
                glBindTexture(GL_TEXTURE_2D, p.tex_id);
126
337
            }
127
338
128
339
            glVertexAttribPointer(prog.position_attr, 3, GL_FLOAT,
129
340
                                  GL_FALSE, sizeof(mgl::Vertex),
130
341
                                  &p.vertices[0].position);
131
342
            glVertexAttribPointer(prog.texcoord_attr, 2, GL_FLOAT,
132
343
                                  GL_FALSE, sizeof(mgl::Vertex),
133
344
                                  &p.vertices[0].texcoord);
134
345
135
346
            if (blend.dst_rgb == GL_ZERO)
136
347
            {
137
348
                glDisable(GL_BLEND);
138
349
            }
139
350
            else
140
351
            {
141
352
                glEnable(GL_BLEND);
142
353
                glBlendFuncSeparate(blend.src_rgb,   blend.dst_rgb,
143
354
                                    blend.src_alpha, blend.dst_alpha);
144
355
            }
145
356
146
357
            glDrawArrays(p.type, 0, p.nvertices);
147
351
        }
358
        }
150
352
359
    }
151
353
        glDrawArrays(p.type, 0, p.nvertices);
360
    catch (std::exception const& ex)
152
361
    {
153
362
        report_exception();
154
354
    }
363
    }
155
355
364
156
356
    glDisableVertexAttribArray(prog.texcoord_attr);
365
    glDisableVertexAttribArray(prog.texcoord_attr);
Reviewer	Review Type	Date Requested	Status
Chris Halse Rogers			Approve on 2016-10-05
Mir CI Bot	continuous-integration		Approve on 2016-10-04
Andreas Pokorny (community)			Approve on 2016-10-04
Cemil Azizoglu (community)		2016-10-03	Approve on 2016-10-03
Review via email: mp+307459@code.launchpad.net