1
=== modified file 'examples/miral-shell/spinner/eglspinner.cpp'
2
--- examples/miral-shell/spinner/eglspinner.cpp	2017-08-21 15:58:34 +0000
3
+++ examples/miral-shell/spinner/eglspinner.cpp	2017-10-11 17:45:38 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright © 2013-2015 Canonical Ltd.
2
 * Copyright © 2013-2017 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This program is free software: you can redistribute it and/or modify
4
 * This program is free software: you can redistribute it and/or modify
10
5
 * under the terms of the GNU General Public License version 2 or 3 as as
5
 * under the terms of the GNU General Public License version 2 or 3 as as
11
@@ -19,6 +19,14 @@
12
19
 *          Kevin DuBois <kevin.dubois@canonical.com>
19
 *          Kevin DuBois <kevin.dubois@canonical.com>
13
20
 */
20
 */
14
21
21
15
22
// Ugly way to detect the Mir EGL patch to mesa
16
23
// NB this has to be before any other includes
17
24
#define MIR_EGL_PLATFORM
18
25
#include <EGL/eglplatform.h>
19
26
#ifndef MIR_CLIENT_API_VERSION
20
27
#define MIR_EGL_UNAVAILABLE
21
28
#endif
22
29
23
22
#include "splash.h"
30
#include "splash.h"
24
23
31
25
24
#include <chrono>
32
#include <chrono>
26
@@ -143,7 +151,7 @@
27
143
    //1.) 0.0   - 0.6:   logo fades in fully
151
    //1.) 0.0   - 0.6:   logo fades in fully
28
144
    //2.) 0.0   - 6.0:   logo does one full spin 360°
152
    //2.) 0.0   - 6.0:   logo does one full spin 360°
29
145
    //3.) 6.0   - 6.833: glow fades in fully, black-background fades out to 50%
153
    //3.) 6.0   - 6.833: glow fades in fully, black-background fades out to 50%
31
146
    //4.) 6.833 - 7.666: glow fades out fully, black-background fades out to 0% 
154
    //4.) 6.833 - 7.666: glow fades out fully, black-background fades out to 0%
32
147
    //5.) 7.666 - 8.266: logo fades out fully
155
    //5.) 7.666 - 8.266: logo fades out fully
33
148
    //8.266..:       now spinner can be closed as all its elements are faded out
156
    //8.266..:       now spinner can be closed as all its elements are faded out
34
149
157
35
@@ -221,11 +229,14 @@
36
221
    "}                                                    \n";
229
    "}                                                    \n";
37
222
230
38
223
std::atomic<bool> dying{false};
231
std::atomic<bool> dying{false};
39
232
40
233
#ifndef MIR_EGL_UNAVAILABLE
41
224
void lifecycle_event_callback(MirConnection* /*connection*/, MirLifecycleState state, void* context)
234
void lifecycle_event_callback(MirConnection* /*connection*/, MirLifecycleState state, void* context)
42
225
{
235
{
43
226
    if (state == mir_lifecycle_connection_lost)
236
    if (state == mir_lifecycle_connection_lost)
44
227
        static_cast<decltype(dying)*>(context)->store(true);
237
        static_cast<decltype(dying)*>(context)->store(true);
45
228
}
238
}
46
239
#endif
47
229
}
240
}
48
230
241
49
231
struct SpinnerSplash::Self
242
struct SpinnerSplash::Self
50
@@ -254,6 +265,7 @@
51
254
void SpinnerSplash::operator()(MirConnection* const connection)
265
void SpinnerSplash::operator()(MirConnection* const connection)
52
255
try
266
try
53
256
{
267
{
54
268
#ifndef MIR_EGL_UNAVAILABLE
55
257
    GLuint prog[2];
269
    GLuint prog[2];
56
258
    GLuint texture[2];
270
    GLuint texture[2];
57
259
    GLint vpos[2];
271
    GLint vpos[2];
58
@@ -365,6 +377,9 @@
59
365
377
60
366
    glDeleteTextures(2, texture);
378
    glDeleteTextures(2, texture);
61
367
    g_timer_destroy (timer);
379
    g_timer_destroy (timer);
62
380
#else
63
381
    (void)connection;
64
382
#endif
65
368
}
383
}
66
369
catch (std::exception const& x)
384
catch (std::exception const& x)
67
370
{
385
{
Status:	Merged
Approved by:	Alan Griffiths on 2017-10-13
Approved revision:	no longer in the source branch.
Merged at revision:	4286
Proposed branch:	lp:~alan-griffiths/mir/do-not-requre-miregl
Merge into:	lp:mir
Diff against target:	67 lines (+17/-2) 1 file modified examples/miral-shell/spinner/eglspinner.cpp (+17/-2)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/do-not-requre-miregl
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-10-11
Alberto Aguirre (community)		2017-10-11	Approve on 2017-10-11
Review via email: mp+332150@code.launchpad.net