1
=== renamed file 'src/server/report/null/display_report.h' => 'include/platform/mir/graphics/null_display_report.h'
2
--- src/server/report/null/display_report.h	2015-04-28 07:54:10 +0000
3
+++ include/platform/mir/graphics/null_display_report.h	2016-09-07 03:00:58 +0000
4
@@ -2,23 +2,23 @@
5
2
 * Copyright © 2012 Canonical Ltd.
2
 * Copyright © 2012 Canonical Ltd.
6
3
 *
3
 *
7
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
9
5
 * under the terms of the GNU General Public License version 3,
5
 * under the terms of the GNU Lesser General Public License version 3,
10
6
 * as published by the Free Software Foundation.
6
 * as published by the Free Software Foundation.
11
7
 *
7
 *
12
8
 * This program is distributed in the hope that it will be useful,
8
 * This program is distributed in the hope that it will be useful,
13
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
11
 * GNU General Public License for more details.
11
 * GNU Lesser General Public License for more details.
17
12
 *
12
 *
19
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU Lesser General Public License
20
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
21
15
 *
15
 *
22
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
23
17
 */
17
 */
24
18
18
25
19
19
28
20
#ifndef MIR_REPORT_NULL_DISPLAY_REPORT_H_
20
#ifndef MIR_GRAPHICS_NULL_DISPLAY_REPORT_H_
29
21
#define MIR_REPORT_NULL_DISPLAY_REPORT_H_
21
#define MIR_GRAPHICS_NULL_DISPLAY_REPORT_H_
30
22
22
31
23
23
32
24
#include "mir/graphics/display_report.h"
24
#include "mir/graphics/display_report.h"
33
@@ -26,11 +26,9 @@
34
26
26
35
27
namespace mir
27
namespace mir
36
28
{
28
{
42
29
namespace report
29
namespace graphics
43
30
{
30
{
44
31
namespace null
31
class NullDisplayReport : public graphics::DisplayReport
40
32
{
41
33
class DisplayReport : public graphics::DisplayReport
45
34
{
32
{
46
35
public:
33
public:
47
36
34
48
@@ -47,6 +45,5 @@
49
47
};
45
};
50
48
}
46
}
51
49
}
47
}
52
50
}
53
51
48
55
52
#endif /* MIR_REPORT_NULL_DISPLAY_REPORT_H_ */
49
#endif /* MIR_GRAPHICS_NULL_DISPLAY_REPORT_H_ */
56
53
50
57
=== modified file 'src/platform/graphics/CMakeLists.txt'
58
--- src/platform/graphics/CMakeLists.txt	2016-06-02 05:33:50 +0000
59
+++ src/platform/graphics/CMakeLists.txt	2016-09-07 03:00:58 +0000
60
@@ -11,6 +11,7 @@
61
11
  pixel_format_utils.cpp
11
  pixel_format_utils.cpp
62
12
  overlapping_output_grouping.cpp
12
  overlapping_output_grouping.cpp
63
13
  platform_probe.cpp
13
  platform_probe.cpp
64
14
  null_display_report.cpp
65
14
)
15
)
66
15
16
67
16
add_library(mirplatformgraphicscommon OBJECT
17
add_library(mirplatformgraphicscommon OBJECT
68
17
18
69
=== renamed file 'src/server/report/null/display_report.cpp' => 'src/platform/graphics/null_display_report.cpp'
70
--- src/server/report/null/display_report.cpp	2015-04-28 07:54:10 +0000
71
+++ src/platform/graphics/null_display_report.cpp	2016-09-07 03:00:58 +0000
72
@@ -2,31 +2,33 @@
73
2
 * Copyright © 2013 Canonical Ltd.
2
 * Copyright © 2013 Canonical Ltd.
74
3
 *
3
 *
75
4
 * This program is free software: you can redistribute it and/or modify it
4
 * This program is free software: you can redistribute it and/or modify it
77
5
 * under the terms of the GNU General Public License version 3,
5
 * under the terms of the GNU Lesser General Public License version 3,
78
6
 * as published by the Free Software Foundation.
6
 * as published by the Free Software Foundation.
79
7
 *
7
 *
80
8
 * This program is distributed in the hope that it will be useful,
8
 * This program is distributed in the hope that it will be useful,
81
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
82
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
84
11
 * GNU General Public License for more details.
11
 * GNU Lesser General Public License for more details.
85
12
 *
12
 *
87
13
 * You should have received a copy of the GNU General Public License
13
 * You should have received a copy of the GNU Lesser General Public License
88
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
89
15
 *
15
 *
90
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
16
 * Authored by: Alan Griffiths <alan@octopull.co.uk>
91
17
 */
17
 */
92
18
18
107
19
#include "display_report.h"
19
#include "mir/graphics/null_display_report.h"
108
20
20
109
21
namespace mrn = mir::report::null;
21
namespace mir { namespace graphics {
110
22
22
111
23
void mrn::DisplayReport::report_successful_setup_of_native_resources() {}
23
void NullDisplayReport::report_successful_setup_of_native_resources() {}
112
24
void mrn::DisplayReport::report_successful_egl_make_current_on_construction() {}
24
void NullDisplayReport::report_successful_egl_make_current_on_construction() {}
113
25
void mrn::DisplayReport::report_successful_egl_buffer_swap_on_construction() {}
25
void NullDisplayReport::report_successful_egl_buffer_swap_on_construction() {}
114
26
void mrn::DisplayReport::report_successful_drm_mode_set_crtc_on_construction() {}
26
void NullDisplayReport::report_successful_drm_mode_set_crtc_on_construction() {}
115
27
void mrn::DisplayReport::report_successful_display_construction() {}
27
void NullDisplayReport::report_successful_display_construction() {}
116
28
void mrn::DisplayReport::report_drm_master_failure(int) {}
28
void NullDisplayReport::report_drm_master_failure(int) {}
117
29
void mrn::DisplayReport::report_vt_switch_away_failure() {}
29
void NullDisplayReport::report_vt_switch_away_failure() {}
118
30
void mrn::DisplayReport::report_vt_switch_back_failure() {}
30
void NullDisplayReport::report_vt_switch_back_failure() {}
119
31
void mrn::DisplayReport::report_egl_configuration(EGLDisplay, EGLConfig) {}
31
void NullDisplayReport::report_egl_configuration(EGLDisplay, EGLConfig) {}
120
32
void mrn::DisplayReport::report_vsync(unsigned int) {}
32
void NullDisplayReport::report_vsync(unsigned int) {}
121
33
122
34
}} // namespace mir::graphics
123
33
35
124
=== modified file 'src/platform/symbols.map'
125
--- src/platform/symbols.map	2016-08-22 14:36:40 +0000
126
+++ src/platform/symbols.map	2016-09-07 03:00:58 +0000
127
@@ -270,6 +270,9 @@
128
270
    android::isEligibleBuiltInKeyboard*;
270
    android::isEligibleBuiltInKeyboard*;
129
271
    __android_log_assert;
271
    __android_log_assert;
130
272
    __android_log_print;
272
    __android_log_print;
131
273
132
274
    vtable?for?mir::graphics::NullDisplayReport*;
133
275
    mir::graphics::NullDisplayReport*;
134
273
  };
276
  };
135
274
 local: *;
277
 local: *;
136
275
};
278
};
137
276
279
138
=== modified file 'src/platforms/android/server/device_quirks.cpp'
139
--- src/platforms/android/server/device_quirks.cpp	2016-08-07 20:38:35 +0000
140
+++ src/platforms/android/server/device_quirks.cpp	2016-09-07 03:00:58 +0000
141
@@ -18,7 +18,7 @@
142
18
18
143
19
#include <GLES2/gl2.h>
19
#include <GLES2/gl2.h>
144
20
#include <EGL/egl.h>
20
#include <EGL/egl.h>
146
21
#include "mir/graphics/display_report.h"
21
#include "mir/graphics/null_display_report.h"
147
22
#include "mir/graphics/gl_config.h"
22
#include "mir/graphics/gl_config.h"
148
23
#include "gl_context.h"
23
#include "gl_context.h"
149
24
#include "device_quirks.h"
24
#include "device_quirks.h"
150
@@ -100,19 +100,7 @@
151
100
    return false;
100
    return false;
152
101
}
101
}
153
102
102
167
103
struct NullReport : mg::DisplayReport
103
mg::NullDisplayReport report;
155
104
{
156
105
    void report_successful_setup_of_native_resources() override {};
157
106
    void report_successful_egl_make_current_on_construction() override {};
158
107
    void report_successful_egl_buffer_swap_on_construction() override {};
159
108
    void report_successful_display_construction() override {};
160
109
    void report_egl_configuration(EGLDisplay, EGLConfig) override {};
161
110
    void report_vsync(unsigned int) override {};
162
111
    void report_successful_drm_mode_set_crtc_on_construction() override {};
163
112
    void report_drm_master_failure(int) override {};
164
113
    void report_vt_switch_away_failure() override {};
165
114
    void report_vt_switch_back_failure() override {};
166
115
} report;
168
116
104
169
117
struct Config : mg::GLConfig
105
struct Config : mg::GLConfig
170
118
{
106
{
171
119
107
172
=== modified file 'src/platforms/android/utils/render_overlays.cpp'
173
--- src/platforms/android/utils/render_overlays.cpp	2016-08-16 19:34:28 +0000
174
+++ src/platforms/android/utils/render_overlays.cpp	2016-09-07 03:00:58 +0000
175
@@ -26,7 +26,7 @@
176
26
#include "mir/graphics/graphic_buffer_allocator.h"
26
#include "mir/graphics/graphic_buffer_allocator.h"
177
27
#include "mir/graphics/buffer_properties.h"
27
#include "mir/graphics/buffer_properties.h"
178
28
#include "mir/graphics/gl_config.h"
28
#include "mir/graphics/gl_config.h"
180
29
#include "mir/graphics/display_report.h"
29
#include "mir/graphics/null_display_report.h"
181
30
#include "mir/renderer/gl/render_target.h"
30
#include "mir/renderer/gl/render_target.h"
182
31
#include "mir/renderer/sw/pixel_source.h"
31
#include "mir/renderer/sw/pixel_source.h"
183
32
#include "mir_image.h"
32
#include "mir_image.h"
184
@@ -226,19 +226,6 @@
185
226
    int stencil_buffer_bits() const override { return 0; }
226
    int stencil_buffer_bits() const override { return 0; }
186
227
};
227
};
187
228
228
188
229
struct DisplayReport : mg::DisplayReport 
189
230
{
190
231
    void report_successful_setup_of_native_resources() override {}
191
232
    void report_successful_egl_make_current_on_construction() override {}
192
233
    void report_successful_egl_buffer_swap_on_construction() override {}
193
234
    void report_successful_display_construction() override {}
194
235
    void report_egl_configuration(EGLDisplay, EGLConfig) override {}
195
236
    void report_vsync(unsigned int) override {}
196
237
    void report_successful_drm_mode_set_crtc_on_construction() override {}
197
238
    void report_drm_master_failure(int) override {}
198
239
    void report_vt_switch_away_failure() override {}
199
240
    void report_vt_switch_back_failure() override {}
200
241
};
201
242
}
229
}
202
243
230
203
244
int main(int argc, char const** argv)
231
int main(int argc, char const** argv)
204
@@ -265,7 +252,7 @@
205
265
252
206
266
    auto platform_fn = platform_library->load_function<mg::CreateHostPlatform>(
253
    auto platform_fn = platform_library->load_function<mg::CreateHostPlatform>(
207
267
        "create_host_platform", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
254
        "create_host_platform", MIR_SERVER_GRAPHICS_PLATFORM_VERSION);
209
268
    auto platform = platform_fn(options, nullptr, std::make_shared<DisplayReport>());
255
    auto platform = platform_fn(options, nullptr, std::make_shared<mg::NullDisplayReport>());
210
269
256
211
270
    //Strange issues going on here with dlopen() + hybris (which uses gnu_indirect_functions)
257
    //Strange issues going on here with dlopen() + hybris (which uses gnu_indirect_functions)
212
271
    //https://github.com/libhybris/libhybris/issues/315
258
    //https://github.com/libhybris/libhybris/issues/315
213
272
259
214
=== modified file 'src/server/report/null/CMakeLists.txt'
215
--- src/server/report/null/CMakeLists.txt	2016-07-28 23:00:22 +0000
216
+++ src/server/report/null/CMakeLists.txt	2016-09-07 03:00:58 +0000
217
@@ -3,7 +3,6 @@
218
3
3
219
4
    compositor_report.cpp
4
    compositor_report.cpp
220
5
    connector_report.cpp
5
    connector_report.cpp
221
6
    display_report.cpp
222
7
    input_report.cpp
6
    input_report.cpp
223
8
    message_processor_report.cpp
7
    message_processor_report.cpp
224
9
    null_report_factory.cpp
8
    null_report_factory.cpp
225
10
9
226
=== modified file 'src/server/report/null/null_report_factory.cpp'
227
--- src/server/report/null/null_report_factory.cpp	2016-07-28 23:00:22 +0000
228
+++ src/server/report/null/null_report_factory.cpp	2016-09-07 03:00:58 +0000
229
@@ -22,11 +22,11 @@
230
22
#include "connector_report.h"
22
#include "connector_report.h"
231
23
#include "message_processor_report.h"
23
#include "message_processor_report.h"
232
24
#include "session_mediator_report.h"
24
#include "session_mediator_report.h"
233
25
#include "display_report.h"
234
26
#include "input_report.h"
25
#include "input_report.h"
235
27
#include "seat_report.h"
26
#include "seat_report.h"
236
28
#include "shell_report.h"
27
#include "shell_report.h"
237
29
#include "scene_report.h"
28
#include "scene_report.h"
238
29
#include "mir/graphics/null_display_report.h"
239
30
#include "mir/logging/null_shared_library_prober_report.h"
30
#include "mir/logging/null_shared_library_prober_report.h"
240
31
31
241
32
std::shared_ptr<mir::compositor::CompositorReport> mir::report::NullReportFactory::create_compositor_report()
32
std::shared_ptr<mir::compositor::CompositorReport> mir::report::NullReportFactory::create_compositor_report()
242
@@ -36,7 +36,7 @@
243
36
36
244
37
std::shared_ptr<mir::graphics::DisplayReport> mir::report::NullReportFactory::create_display_report()
37
std::shared_ptr<mir::graphics::DisplayReport> mir::report::NullReportFactory::create_display_report()
245
38
{
38
{
247
39
    return std::make_shared<null::DisplayReport>();
39
    return std::make_shared<mir::graphics::NullDisplayReport>();
248
40
}
40
}
249
41
41
250
42
std::shared_ptr<mir::scene::SceneReport> mir::report::NullReportFactory::create_scene_report()
42
std::shared_ptr<mir::scene::SceneReport> mir::report::NullReportFactory::create_scene_report()
251
43
43
252
=== modified file 'tests/unit-tests/platforms/nested/test_nested_display.cpp'
253
--- tests/unit-tests/platforms/nested/test_nested_display.cpp	2016-05-04 20:53:03 +0000
254
+++ tests/unit-tests/platforms/nested/test_nested_display.cpp	2016-09-07 03:00:58 +0000
255
@@ -19,7 +19,7 @@
256
19
#include "src/server/graphics/nested/display.h"
19
#include "src/server/graphics/nested/display.h"
257
20
#include "src/server/graphics/nested/host_connection.h"
20
#include "src/server/graphics/nested/host_connection.h"
258
21
#include "src/server/graphics/nested/host_surface.h"
21
#include "src/server/graphics/nested/host_surface.h"
260
22
#include "src/server/report/null/display_report.h"
22
#include "mir/graphics/null_display_report.h"
261
23
#include "mir/graphics/default_display_configuration_policy.h"
23
#include "mir/graphics/default_display_configuration_policy.h"
262
24
#include "src/server/input/null_input_dispatcher.h"
24
#include "src/server/input/null_input_dispatcher.h"
263
25
#include "mir_display_configuration_builder.h"
25
#include "mir_display_configuration_builder.h"
264
@@ -77,7 +77,7 @@
265
77
77
266
78
    testing::NiceMock<mtd::MockEGL> mock_egl;
78
    testing::NiceMock<mtd::MockEGL> mock_egl;
267
79
    mi::NullInputDispatcher null_input_dispatcher;
79
    mi::NullInputDispatcher null_input_dispatcher;
269
80
    mir::report::null::DisplayReport null_display_report;
80
    mg::NullDisplayReport null_display_report;
270
81
    mg::CloneDisplayConfigurationPolicy default_conf_policy;
81
    mg::CloneDisplayConfigurationPolicy default_conf_policy;
271
82
    mtd::StubGLConfig stub_gl_config;
82
    mtd::StubGLConfig stub_gl_config;
272
83
    std::shared_ptr<mtd::NullPlatform> null_platform{
83
    std::shared_ptr<mtd::NullPlatform> null_platform{
Status:	Work in progress
Proposed branch:	lp:~vanvugt/mir/deduplicate-NullDisplayReport
Merge into:	lp:mir
Diff against target:	272 lines (+40/-63) 9 files modified include/platform/mir/graphics/null_display_report.h (+9/-12) src/platform/graphics/CMakeLists.txt (+1/-0) src/platform/graphics/null_display_report.cpp (+19/-17) src/platform/symbols.map (+3/-0) src/platforms/android/server/device_quirks.cpp (+2/-14) src/platforms/android/utils/render_overlays.cpp (+2/-15) src/server/report/null/CMakeLists.txt (+0/-1) src/server/report/null/null_report_factory.cpp (+2/-2) tests/unit-tests/platforms/nested/test_nested_display.cpp (+2/-2)
To merge this branch:	bzr merge lp:~vanvugt/mir/deduplicate-NullDisplayReport
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-09-07
Alan Griffiths		2016-09-05	Disapprove on 2016-09-05
Review via email: mp+304905@code.launchpad.net