1
=== modified file 'include/test/mir/test/doubles/mock_egl.h'
2
--- include/test/mir/test/doubles/mock_egl.h	2015-11-13 19:46:42 +0000
3
+++ include/test/mir/test/doubles/mock_egl.h	2015-11-30 13:56:32 +0000
4
@@ -21,8 +21,9 @@
5
21
21
6
22
#include <gmock/gmock.h>
22
#include <gmock/gmock.h>
7
23
23
8
24
#include <mutex>
9
25
#include <thread>
10
24
#include <unordered_map>
26
#include <unordered_map>
11
25
#include <thread>
12
26
27
13
27
#define GL_GLEXT_PROTOTYPES
28
#define GL_GLEXT_PROTOTYPES
14
28
#define EGL_EGLEXT_PROTOTYPES
29
#define EGL_EGLEXT_PROTOTYPES
15
@@ -150,13 +151,14 @@
16
150
    MOCK_METHOD2(eglDestroySyncKHR, EGLBoolean(EGLDisplay, EGLSyncKHR));
151
    MOCK_METHOD2(eglDestroySyncKHR, EGLBoolean(EGLDisplay, EGLSyncKHR));
17
151
    MOCK_METHOD4(eglClientWaitSyncKHR, EGLint(EGLDisplay, EGLSyncKHR, EGLint, EGLTimeKHR));
152
    MOCK_METHOD4(eglClientWaitSyncKHR, EGLint(EGLDisplay, EGLSyncKHR, EGLint, EGLTimeKHR));
18
152
153
26
153
    EGLDisplay fake_egl_display;
154
    EGLDisplay const fake_egl_display;
27
154
    EGLConfig* fake_configs;
155
    EGLConfig const* const fake_configs;
28
155
    EGLint fake_configs_num;
156
    EGLint const fake_configs_num;
29
156
    EGLSurface fake_egl_surface;
157
    EGLSurface const fake_egl_surface;
30
157
    EGLContext fake_egl_context;
158
    EGLContext const fake_egl_context;
31
158
    EGLImageKHR fake_egl_image;
159
    EGLImageKHR const fake_egl_image;
32
159
    int fake_visual_id;
160
    int const fake_visual_id;
33
161
    std::mutex mutable current_contexts_mutex;
34
160
    std::unordered_map<std::thread::id,EGLContext> current_contexts;
162
    std::unordered_map<std::thread::id,EGLContext> current_contexts;
35
161
};
163
};
36
162
164
37
163
165
38
=== modified file 'tests/mir_test_doubles/mock_egl.cpp'
39
--- tests/mir_test_doubles/mock_egl.cpp	2015-11-13 19:46:42 +0000
40
+++ tests/mir_test_doubles/mock_egl.cpp	2015-11-30 13:56:32 +0000
41
@@ -108,15 +108,19 @@
42
108
108
43
109
    ON_CALL(*this, eglMakeCurrent(_,_,_,_))
109
    ON_CALL(*this, eglMakeCurrent(_,_,_,_))
44
110
    .WillByDefault(Invoke(
110
    .WillByDefault(Invoke(
46
111
        [&] (EGLDisplay, EGLSurface, EGLSurface, EGLContext context)
111
        [this] (EGLDisplay, EGLSurface, EGLSurface, EGLContext context)
47
112
        {
112
        {
48
113
            std::lock_guard<decltype(current_contexts_mutex)> lock{current_contexts_mutex};
49
113
            current_contexts[std::this_thread::get_id()] = context;
114
            current_contexts[std::this_thread::get_id()] = context;
50
114
            return EGL_TRUE;
115
            return EGL_TRUE;
51
115
        }));
116
        }));
52
116
117
53
117
    ON_CALL(*this, eglGetCurrentContext())
118
    ON_CALL(*this, eglGetCurrentContext())
56
118
    .WillByDefault(Invoke(
119
    .WillByDefault(Invoke([this]
57
119
        [&] { return current_contexts[std::this_thread::get_id()]; }));
120
        {
58
121
            std::lock_guard<decltype(current_contexts_mutex)> lock{current_contexts_mutex};
59
122
            return current_contexts[std::this_thread::get_id()];
60
123
        }));
61
120
124
62
121
    ON_CALL(*this, eglSwapBuffers(_,_))
125
    ON_CALL(*this, eglSwapBuffers(_,_))
63
122
        .WillByDefault(Return(EGL_TRUE));                              
126
        .WillByDefault(Return(EGL_TRUE));
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2015-12-01
Alexandros Frantzis (community)		2015-11-30	Approve on 2015-11-30
Review via email: mp+278961@code.launchpad.net