1
=== modified file 'src/platforms/android/client/android_client_platform.cpp'
2
--- src/platforms/android/client/android_client_platform.cpp	2015-07-21 04:30:03 +0000
3
+++ src/platforms/android/client/android_client_platform.cpp	2015-10-28 07:23:08 +0000
4
@@ -24,6 +24,7 @@
5
24
#include "android_client_buffer_factory.h"
24
#include "android_client_buffer_factory.h"
6
25
#include "egl_native_surface_interpreter.h"
25
#include "egl_native_surface_interpreter.h"
7
26
26
8
27
#include "mir/weak_egl.h"
9
27
#include <EGL/egl.h>
28
#include <EGL/egl.h>
10
28
29
11
29
#include <boost/throw_exception.hpp>
30
#include <boost/throw_exception.hpp>
12
@@ -124,19 +125,6 @@
13
124
    return buf->anwb();
125
    return buf->anwb();
14
125
}
126
}
15
126
127
16
127
/*
17
128
 * Driver modules get dlopened with RTLD_NOW, meaning that if the below egl
18
129
 * functions aren't found in memory the driver fails to load. This would
19
130
 * normally prevent software clients (those not linked to libEGL) from
20
131
 * successfully loading our client module, but if we mark the undefined
21
132
 * egl function symbols as "weak" then their absence is no longer an error,
22
133
 * even with RTLD_NOW.
23
134
 */
24
135
extern "C" EGLAPI EGLBoolean EGLAPIENTRY
25
136
    eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
26
137
                       EGLint attribute, EGLint *value)
27
138
    __attribute__((weak));
28
139
29
140
MirPixelFormat mcla::AndroidClientPlatform::get_egl_pixel_format(
128
MirPixelFormat mcla::AndroidClientPlatform::get_egl_pixel_format(
30
141
    EGLDisplay disp, EGLConfig conf) const
129
    EGLDisplay disp, EGLConfig conf) const
31
142
{
130
{
32
@@ -144,7 +132,8 @@
33
144
132
34
145
    // EGL_KHR_platform_android says this will always work...
133
    // EGL_KHR_platform_android says this will always work...
35
146
    EGLint vis = 0;
134
    EGLint vis = 0;
37
147
    if (eglGetConfigAttrib(disp, conf, EGL_NATIVE_VISUAL_ID, &vis))
135
    mcl::WeakEGL weak;
38
136
    if (weak.eglGetConfigAttrib(disp, conf, EGL_NATIVE_VISUAL_ID, &vis))
39
148
        mir_format = mir::graphics::android::to_mir_format(vis);
137
        mir_format = mir::graphics::android::to_mir_format(vis);
40
149
138
41
150
    return mir_format;
139
    return mir_format;
42
151
140
43
=== modified file 'src/platforms/common/client/mir/CMakeLists.txt'
44
--- src/platforms/common/client/mir/CMakeLists.txt	2015-01-19 14:16:46 +0000
45
+++ src/platforms/common/client/mir/CMakeLists.txt	2015-10-28 07:23:08 +0000
46
@@ -2,4 +2,5 @@
47
2
2
48
3
add_library(client_platform_common OBJECT
3
add_library(client_platform_common OBJECT
49
4
  aging_buffer.cpp
4
  aging_buffer.cpp
50
5
  weak_egl.cpp
51
5
)
6
)
52
6
7
53
=== added file 'src/platforms/common/client/mir/weak_egl.cpp'
54
--- src/platforms/common/client/mir/weak_egl.cpp	1970-01-01 00:00:00 +0000
55
+++ src/platforms/common/client/mir/weak_egl.cpp	2015-10-28 07:23:08 +0000
56
@@ -0,0 +1,65 @@
57
1
/*
58
2
 * EGL without any linkage requirements!
59
3
 * ~~~
60
4
 * Copyright © 2015 Canonical Ltd.
61
5
 *
62
6
 * This program is free software: you can redistribute it and/or modify it
63
7
 * under the terms of the GNU Lesser General Public License version 3,
64
8
 * as published by the Free Software Foundation.
65
9
 *
66
10
 * This program is distributed in the hope that it will be useful,
67
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
68
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
69
13
 * GNU Lesser General Public License for more details.
70
14
 *
71
15
 * You should have received a copy of the GNU Lesser General Public License
72
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
73
17
 *
74
18
 * Authored by: Daniel van Vugt <daniel.van.vugt@canonical.com>
75
19
 */
76
20
77
21
#include "weak_egl.h"
78
22
#include <dlfcn.h>
79
23
80
24
namespace mir { namespace client {
81
25
82
26
WeakEGL::WeakEGL()
83
27
    : egl1(nullptr)
84
28
    , pGetConfigAttrib(nullptr)
85
29
{
86
30
}
87
31
88
32
WeakEGL::~WeakEGL()
89
33
{
90
34
    if (egl1)
91
35
        dlclose(egl1);
92
36
}
93
37
94
38
EGLBoolean WeakEGL::eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
95
39
                                       EGLint attribute, EGLint* value)
96
40
{
97
41
    if (find("eglGetConfigAttrib", (void**)&pGetConfigAttrib))
98
42
        return pGetConfigAttrib(dpy, config, attribute, value);
99
43
    else
100
44
        return EGL_FALSE;
101
45
}
102
46
103
47
bool WeakEGL::find(char const* name, void** func)
104
48
{
105
49
    if (!*func)
106
50
    {
107
51
        // RTLD_DEFAULT is first choice to support wrappers like MockEGL
108
52
        if (!(*func = dlsym(RTLD_DEFAULT, name)))
109
53
        {
110
54
            // This will work more in real-world situations if the library
111
55
            // is hidden behind an RTLD_LOCAL (e.g. a Qt plugin)
112
56
            if (!egl1)
113
57
                egl1 = dlopen("libEGL.so.1", RTLD_NOLOAD|RTLD_LAZY);
114
58
            if (egl1)
115
59
                *func = dlsym(egl1, name);
116
60
        }
117
61
    }
118
62
    return *func != nullptr;
119
63
}
120
64
121
65
}} // namespace mir::client
122
0
66
123
=== added file 'src/platforms/common/client/mir/weak_egl.h'
124
--- src/platforms/common/client/mir/weak_egl.h	1970-01-01 00:00:00 +0000
125
+++ src/platforms/common/client/mir/weak_egl.h	2015-10-28 07:23:08 +0000
126
@@ -0,0 +1,47 @@
127
1
/*
128
2
 * EGL without any linkage requirements!
129
3
 * ~~~
130
4
 * Copyright © 2015 Canonical Ltd.
131
5
 *
132
6
 * This program is free software: you can redistribute it and/or modify it
133
7
 * under the terms of the GNU Lesser General Public License version 3,
134
8
 * as published by the Free Software Foundation.
135
9
 *
136
10
 * This program is distributed in the hope that it will be useful,
137
11
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
138
12
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
139
13
 * GNU Lesser General Public License for more details.
140
14
 *
141
15
 * You should have received a copy of the GNU Lesser General Public License
142
16
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
143
17
 *
144
18
 * Authored by: Daniel van Vugt <daniel.van.vugt@canonical.com>
145
19
 */
146
20
147
21
#ifndef MIR_CLIENT_WEAK_EGL_H_
148
22
#define MIR_CLIENT_WEAK_EGL_H_
149
23
150
24
#include <EGL/egl.h>
151
25
#include <dlfcn.h>
152
26
153
27
namespace mir { namespace client {
154
28
155
29
class WeakEGL
156
30
{
157
31
public:
158
32
    WeakEGL();
159
33
    ~WeakEGL();
160
34
    EGLBoolean eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
161
35
                                  EGLint attribute, EGLint* value);
162
36
163
37
private:
164
38
    bool find(char const* name, void** func);
165
39
166
40
    void* egl1;
167
41
    EGLBoolean (*pGetConfigAttrib)(EGLDisplay dpy, EGLConfig config,
168
42
                                   EGLint attribute, EGLint* value);
169
43
};
170
44
171
45
}} // namespace mir::client
172
46
173
47
#endif // MIR_CLIENT_WEAK_EGL_H_
174
0
48
175
=== modified file 'src/platforms/mesa/client/client_platform.cpp'
176
--- src/platforms/mesa/client/client_platform.cpp	2015-10-19 12:10:38 +0000
177
+++ src/platforms/mesa/client/client_platform.cpp	2015-10-28 07:23:08 +0000
178
@@ -23,6 +23,7 @@
179
23
#include "native_surface.h"
23
#include "native_surface.h"
180
24
#include "mir/client_buffer_factory.h"
24
#include "mir/client_buffer_factory.h"
181
25
#include "mir/client_context.h"
25
#include "mir/client_context.h"
182
26
#include "mir/weak_egl.h"
183
26
#include "mir_toolkit/mesa/platform_operation.h"
27
#include "mir_toolkit/mesa/platform_operation.h"
184
27
28
185
28
#include <cstring>
29
#include <cstring>
186
@@ -163,19 +164,6 @@
187
163
}
164
}
188
164
165
189
165
166
190
166
/*
191
167
 * Driver modules get dlopened with RTLD_NOW, meaning that if the below egl
192
168
 * functions aren't found in memory the driver fails to load. This would
193
169
 * normally prevent software clients (those not linked to libEGL) from
194
170
 * successfully loading our client module, but if we mark the undefined
195
171
 * egl function symbols as "weak" then their absence is no longer an error,
196
172
 * even with RTLD_NOW.
197
173
 */
198
174
extern "C" EGLAPI EGLBoolean EGLAPIENTRY
199
175
    eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config,
200
176
                       EGLint attribute, EGLint *value)
201
177
    __attribute__((weak));
202
178
203
179
MirPixelFormat mclm::ClientPlatform::get_egl_pixel_format(
167
MirPixelFormat mclm::ClientPlatform::get_egl_pixel_format(
204
180
    EGLDisplay disp, EGLConfig conf) const
168
    EGLDisplay disp, EGLConfig conf) const
205
181
{
169
{
206
@@ -192,10 +180,11 @@
207
192
     * EGL_NATIVE_VISUAL_ID, so ignore that for now.
180
     * EGL_NATIVE_VISUAL_ID, so ignore that for now.
208
193
     */
181
     */
209
194
    EGLint r = 0, g = 0, b = 0, a = 0;
182
    EGLint r = 0, g = 0, b = 0, a = 0;
214
195
    eglGetConfigAttrib(disp, conf, EGL_RED_SIZE, &r);
183
    mcl::WeakEGL weak;
215
196
    eglGetConfigAttrib(disp, conf, EGL_GREEN_SIZE, &g);
184
    weak.eglGetConfigAttrib(disp, conf, EGL_RED_SIZE, &r);
216
197
    eglGetConfigAttrib(disp, conf, EGL_BLUE_SIZE, &b);
185
    weak.eglGetConfigAttrib(disp, conf, EGL_GREEN_SIZE, &g);
217
198
    eglGetConfigAttrib(disp, conf, EGL_ALPHA_SIZE, &a);
186
    weak.eglGetConfigAttrib(disp, conf, EGL_BLUE_SIZE, &b);
218
187
    weak.eglGetConfigAttrib(disp, conf, EGL_ALPHA_SIZE, &a);
219
199
188
220
200
    if (r == 8 && g == 8 && b == 8)
189
    if (r == 8 && g == 8 && b == 8)
221
201
    {
190
    {
Reviewer	Review Type	Date Requested	Status
Alberto Aguirre (community)		2015-10-28	Approve on 2015-10-28
Alan Griffiths		2015-10-27	Approve on 2015-10-28
PS Jenkins bot (community)	continuous-integration		Approve on 2015-10-28
Review via email: mp+275820@code.launchpad.net