Mir

Merge lp:~andreas-pokorny/mir/expose-client-platform-headers into lp:mir

Proposed by Andreas Pokorny on 2017-05-06
Status: Merged
Approved by: Alan Griffiths on 2017-05-16
Approved revision: 4167
Merged at revision: 4167
Proposed branch: lp:~andreas-pokorny/mir/expose-client-platform-headers
Merge into: lp:mir
Diff against target: 938 lines (+97/-95)
64 files modified
include/client/mir_toolkit/extensions/hardware_buffer_stream.h (+4/-4)
include/test/mir/test/doubles/mock_client_buffer.h (+1/-1)
include/test/mir/test/doubles/mock_client_context.h (+1/-1)
include/test/mir/test/doubles/mock_egl_native_surface.h (+1/-1)
src/client/CMakeLists.txt (+1/-0)
src/client/buffer.cpp (+1/-1)
src/client/buffer_factory.cpp (+1/-1)
src/client/buffer_stream.cpp (+1/-1)
src/client/buffer_stream.h (+2/-2)
src/client/buffer_vault.cpp (+2/-2)
src/client/default_connection_configuration.cpp (+1/-1)
src/client/mir_buffer_api.cpp (+1/-2)
src/client/mir_buffer_stream_api.cpp (+1/-1)
src/client/mir_connection.cpp (+2/-2)
src/client/mir_connection.h (+2/-2)
src/client/mir_surface.cpp (+1/-1)
src/client/mir_surface.h (+1/-1)
src/client/presentation_chain.cpp (+2/-2)
src/client/probing_client_platform_factory.cpp (+1/-1)
src/client/probing_client_platform_factory.h (+1/-1)
src/client/render_surface.cpp (+1/-1)
src/client/screencast_stream.cpp (+2/-2)
src/client/screencast_stream.h (+2/-2)
src/platforms/CMakeLists.txt (+2/-0)
src/platforms/common/client/mir/CMakeLists.txt (+1/-1)
src/platforms/common/client/mir/aging_buffer.h (+1/-1)
src/platforms/eglstream-kms/client/client_buffer_factory.h (+1/-1)
src/platforms/eglstream-kms/client/client_platform.cpp (+2/-2)
src/platforms/eglstream-kms/client/client_platform.h (+1/-1)
src/platforms/eglstream-kms/client/client_platform_factory.cpp (+3/-3)
src/platforms/mesa/client/client_buffer_factory.h (+1/-1)
src/platforms/mesa/client/client_platform.cpp (+3/-3)
src/platforms/mesa/client/client_platform.h (+1/-1)
src/platforms/mesa/client/client_platform_factory.cpp (+3/-3)
src/platforms/mesa/client/mesa_native_display_container.cpp (+1/-1)
src/platforms/mesa/client/mesa_native_display_container.h (+1/-1)
src/platforms/mesa/client/native_surface.cpp (+1/-1)
src/platforms/mesa/client/native_surface.h (+1/-1)
tests/acceptance-tests/test_client_library_errors.cpp (+3/-3)
tests/include/mir/test/doubles/mock_client_buffer_factory.h (+1/-1)
tests/include/mir/test/doubles/mock_client_platform.h (+2/-2)
tests/include/mir/test/doubles/mock_mir_buffer.h (+1/-1)
tests/include/mir/test/doubles/mock_mir_buffer_stream.h (+1/-1)
tests/include/mir/test/doubles/null_client_buffer.h (+1/-1)
tests/include/mir/test/doubles/stub_client_buffer.h (+1/-1)
tests/include/mir/test/doubles/stub_client_buffer_factory.h (+1/-1)
tests/include/mir/test/doubles/stub_client_platform_factory.h (+1/-1)
tests/include/mir_test_framework/client_platform_factory.h (+1/-1)
tests/include/mir_test_framework/stub_client_platform_factory.h (+2/-2)
tests/mir_test_doubles/mock_egl.cpp (+1/-1)
tests/mir_test_framework/stub_client_platform_factory.cpp (+3/-3)
tests/mir_test_framework/stub_client_platform_module.cpp (+2/-2)
tests/unit-tests/client/test_buffer_vault.cpp (+1/-1)
tests/unit-tests/client/test_client_buffer_stream.cpp (+1/-1)
tests/unit-tests/client/test_client_mir_surface.cpp (+4/-4)
tests/unit-tests/client/test_client_platform.cpp (+3/-3)
tests/unit-tests/client/test_mir_connection.cpp (+3/-3)
tests/unit-tests/client/test_mir_render_surface.cpp (+1/-1)
tests/unit-tests/client/test_mir_screencast.cpp (+2/-2)
tests/unit-tests/client/test_presentation_chain.cpp (+1/-1)
tests/unit-tests/client/test_probing_client_platform_factory.cpp (+1/-1)
tests/unit-tests/client/test_screencast_stream.cpp (+1/-1)
tests/unit-tests/platforms/mesa/client/test_client_platform.cpp (+1/-1)
tests/unit-tests/platforms/mesa/client/test_native_surface.cpp (+1/-1)
To merge this branch: bzr merge lp:~andreas-pokorny/mir/expose-client-platform-headers
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration 2017-05-06 Approve on 2017-05-16
Alan Griffiths Approve on 2017-05-16
Andreas Pokorny (community) Abstain on 2017-05-12
Daniel van Vugt 2017-05-06 Pending
Review via email: mp+323717@code.launchpad.net

Commit message

Expose the necessary headers for out of source plaform library builds

* interfaces needed to implement a client platform
* interfaces that appear in the factory interface for a server platform
* common mocks required to test platform libraries

Description of the change

This exposes the previously private headers necessary to implement a graphics driver for mir

To post a comment you must log in.
Andreas Pokorny (andreas-pokorny) wrote :

I tested that MP with the code in https://launchpad.net/mir-android-platform

Alan Griffiths (alan-griffiths) wrote :

This needs consideration alongside the work Kevin was doing to tidy up these interfaces:

    https://code.launchpad.net/~kdub/mir/split-nested/+merge/321458
    https://code.launchpad.net/~kdub/mir/split-mesa/+merge/321058

Would it be useful to complete that work, or should we abandon it?

review: Needs Information
Andreas Pokorny (andreas-pokorny) wrote :

We should complete that work too, whatever comes in second needs to rebase.. and I need to apply that rework on the android platform too then.

Alan Griffiths (alan-griffiths) wrote :

> We should complete that work too, whatever comes in second needs to rebase..
> and I need to apply that rework on the android platform too then.

Actually, it seems to merge cleanly.

review: Approve
Alan Griffiths (alan-griffiths) wrote :

Packaging error:

12:31:36 dh_install: usr/include/mirclient/mir/mir_buffer_stream.h exists in debian/tmp but is not installed to anywhere
12:31:36 dh_install: usr/include/mirclient/mir/mir_buffer.h exists in debian/tmp but is not installed to anywhere

review: Needs Fixing
4166. By Andreas Pokorny on 2017-05-12

List new files in install scripts

Andreas Pokorny (andreas-pokorny) wrote :

should I move include/mirclient/mir/mir_buffer.h to include/mirplatform/mir/? so it ends up in platform-dev?

Andreas Pokorny (andreas-pokorny) wrote :

^

review: Needs Information
Alan Griffiths (alan-griffiths) wrote :

> should I move include/mirclient/mir/mir_buffer.h to include/mirplatform/mir/?
> so it ends up in platform-dev?

That seems a more sensible place. Really, include/mirclient/mir/ seems the wrong place for anything, but history...

PS
I'm also surprised that individual header files are listed in the package .install.

4167. By Andreas Pokorny on 2017-05-12

instead move the interfaces used between client and client platform into libplatform-dev.

Andreas Pokorny (andreas-pokorny) wrote :

Ok moved again..

review: Abstain
Alan Griffiths (alan-griffiths) wrote :

We may want to tidy up further before a release, but this is OK.

review: Approve
Mir CI Bot (mir-ci-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'src/include/client/mir_toolkit/extensions/hardware_buffer_stream.h' => 'include/client/mir_toolkit/extensions/hardware_buffer_stream.h'
2--- src/include/client/mir_toolkit/extensions/hardware_buffer_stream.h 2017-04-21 03:08:25 +0000
3+++ include/client/mir_toolkit/extensions/hardware_buffer_stream.h 2017-05-12 15:59:26 +0000
4@@ -1,16 +1,16 @@
5 /*
6 * Copyright © 2017 Canonical Ltd.
7 *
8- * This program is free software: you can redistribute it and/or modify it
9- * under the terms of the GNU General Public License version 3,
10+ * This program is free software: you can redistribute it and/or modify
11+ * it under the terms of the GNU Lesser General Public License version 3
12 * as published by the Free Software Foundation.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17- * GNU General Public License for more details.
18+ * GNU Lesser General Public License for more details.
19 *
20- * You should have received a copy of the GNU General Public License
21+ * You should have received a copy of the GNU Lesser General Public License
22 * along with this program. If not, see <http://www.gnu.org/licenses/>.
23 *
24 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
25
26=== added directory 'include/platform/mir/client'
27=== renamed file 'src/include/client/mir/client_buffer.h' => 'include/platform/mir/client/client_buffer.h'
28=== renamed file 'src/include/client/mir/client_buffer_factory.h' => 'include/platform/mir/client/client_buffer_factory.h'
29=== renamed file 'src/include/client/mir/client_context.h' => 'include/platform/mir/client/client_context.h'
30=== renamed file 'src/include/client/mir/client_platform.h' => 'include/platform/mir/client/client_platform.h'
31=== renamed file 'src/include/client/mir/client_platform_factory.h' => 'include/platform/mir/client/client_platform_factory.h'
32=== renamed file 'src/include/client/mir/egl_native_display_container.h' => 'include/platform/mir/client/egl_native_display_container.h'
33=== renamed file 'src/include/client/mir/egl_native_surface.h' => 'include/platform/mir/client/egl_native_surface.h'
34=== renamed file 'src/include/platform/mir/emergency_cleanup_registry.h' => 'include/platform/mir/emergency_cleanup_registry.h'
35=== renamed file 'src/include/platform/mir/graphics/buffer_ipc_message.h' => 'include/platform/mir/graphics/buffer_ipc_message.h'
36=== renamed file 'src/include/platform/mir/graphics/display_report.h' => 'include/platform/mir/graphics/display_report.h'
37=== renamed file 'src/include/platform/mir/graphics/egl_error.h' => 'include/platform/mir/graphics/egl_error.h'
38=== renamed file 'src/include/platform/mir/graphics/egl_extensions.h' => 'include/platform/mir/graphics/egl_extensions.h'
39=== renamed file 'src/include/platform/mir/graphics/egl_resources.h' => 'include/platform/mir/graphics/egl_resources.h'
40=== renamed file 'src/include/platform/mir/graphics/transformation.h' => 'include/platform/mir/graphics/transformation.h'
41=== renamed file 'src/include/client/mir/mir_buffer.h' => 'include/platform/mir/mir_buffer.h'
42=== renamed file 'src/include/client/mir/mir_buffer_stream.h' => 'include/platform/mir/mir_buffer_stream.h'
43=== renamed file 'src/include/client/mir/mir_render_surface.h' => 'include/platform/mir/mir_render_surface.h'
44=== renamed file 'src/include/platform/mir/options/program_option.h' => 'include/platform/mir/options/program_option.h'
45=== added directory 'include/platform/mir/renderer'
46=== added directory 'include/platform/mir/renderer/sw'
47=== renamed file 'include/renderers/sw/mir/renderer/sw/pixel_source.h' => 'include/platform/mir/renderer/sw/pixel_source.h'
48=== renamed file 'tests/include/mir/test/doubles/mock_client_buffer.h' => 'include/test/mir/test/doubles/mock_client_buffer.h'
49--- tests/include/mir/test/doubles/mock_client_buffer.h 2017-04-28 03:49:54 +0000
50+++ include/test/mir/test/doubles/mock_client_buffer.h 2017-05-12 15:59:26 +0000
51@@ -19,7 +19,7 @@
52 #ifndef MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_H_
53 #define MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_H_
54
55-#include "mir/client_buffer.h"
56+#include "mir/client/client_buffer.h"
57
58 #include <gtest/gtest.h>
59 #include <gmock/gmock.h>
60
61=== renamed file 'tests/include/mir/test/doubles/mock_client_context.h' => 'include/test/mir/test/doubles/mock_client_context.h'
62--- tests/include/mir/test/doubles/mock_client_context.h 2017-04-28 03:49:54 +0000
63+++ include/test/mir/test/doubles/mock_client_context.h 2017-05-12 15:59:26 +0000
64@@ -20,7 +20,7 @@
65 #define MIR_TEST_DOUBLES_MOCK_CLIENT_CONTEXT_H_
66
67 #include "mir_toolkit/mir_client_library.h"
68-#include "mir/client_context.h"
69+#include "mir/client/client_context.h"
70
71 #include <gmock/gmock.h>
72
73
74=== renamed file 'tests/include/mir/test/doubles/mock_egl_native_surface.h' => 'include/test/mir/test/doubles/mock_egl_native_surface.h'
75--- tests/include/mir/test/doubles/mock_egl_native_surface.h 2017-04-28 03:49:54 +0000
76+++ include/test/mir/test/doubles/mock_egl_native_surface.h 2017-05-12 15:59:26 +0000
77@@ -19,7 +19,7 @@
78 #ifndef MIR_TEST_DOUBLES_MOCK_EGL_NATIVE_SURFACE_H_
79 #define MIR_TEST_DOUBLES_MOCK_EGL_NATIVE_SURFACE_H_
80
81-#include "mir/egl_native_surface.h"
82+#include "mir/client/egl_native_surface.h"
83
84 #include <gmock/gmock.h>
85
86
87=== modified file 'src/client/CMakeLists.txt'
88--- src/client/CMakeLists.txt 2017-04-28 03:49:54 +0000
89+++ src/client/CMakeLists.txt 2017-05-12 15:59:26 +0000
90@@ -25,6 +25,7 @@
91 include_directories(
92 ${PROTOBUF_INCLUDE_DIRS}
93 ${CMAKE_CURRENT_BINARY_DIR}
94+ ${PROJECT_SOURCE_DIR}/include/platform
95 ${PROJECT_SOURCE_DIR}/include/client
96 ${PROJECT_SOURCE_DIR}/src/include/client
97 ${PROJECT_SOURCE_DIR}/src/include/cookie
98
99=== modified file 'src/client/buffer.cpp'
100--- src/client/buffer.cpp 2017-04-28 03:49:54 +0000
101+++ src/client/buffer.cpp 2017-05-12 15:59:26 +0000
102@@ -16,7 +16,7 @@
103 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
104 */
105
106-#include "mir/client_buffer.h"
107+#include "mir/client/client_buffer.h"
108 #include "buffer.h"
109 #include <boost/throw_exception.hpp>
110
111
112=== modified file 'src/client/buffer_factory.cpp'
113--- src/client/buffer_factory.cpp 2017-04-28 03:49:54 +0000
114+++ src/client/buffer_factory.cpp 2017-05-12 15:59:26 +0000
115@@ -16,7 +16,7 @@
116 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
117 */
118
119-#include "mir/client_buffer_factory.h"
120+#include "mir/client/client_buffer_factory.h"
121 #include "buffer_factory.h"
122 #include "error_buffer.h"
123 #include <algorithm>
124
125=== modified file 'src/client/buffer_stream.cpp'
126--- src/client/buffer_stream.cpp 2017-05-08 04:12:58 +0000
127+++ src/client/buffer_stream.cpp 2017-05-12 15:59:26 +0000
128@@ -33,7 +33,7 @@
129 #include "connection_surface_map.h"
130
131 #include "mir/log.h"
132-#include "mir/client_platform.h"
133+#include "mir/client/client_platform.h"
134 #include "mir/frontend/client_constants.h"
135 #include "mir_toolkit/mir_native_buffer.h"
136
137
138=== modified file 'src/client/buffer_stream.h'
139--- src/client/buffer_stream.h 2017-05-08 04:12:58 +0000
140+++ src/client/buffer_stream.h 2017-05-12 15:59:26 +0000
141@@ -20,8 +20,8 @@
142 #define MIR_CLIENT_BUFFER_STREAM_H
143
144 #include "mir_wait_handle.h"
145-#include "mir/egl_native_surface.h"
146-#include "mir/client_buffer.h"
147+#include "mir/client/egl_native_surface.h"
148+#include "mir/client/client_buffer.h"
149 #include "mir/mir_buffer_stream.h"
150 #include "mir/geometry/size.h"
151 #include "mir/optional_value.h"
152
153=== modified file 'src/client/buffer_vault.cpp'
154--- src/client/buffer_vault.cpp 2017-04-28 03:49:54 +0000
155+++ src/client/buffer_vault.cpp 2017-05-12 15:59:26 +0000
156@@ -16,8 +16,8 @@
157 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
158 */
159
160-#include "mir/client_buffer_factory.h"
161-#include "mir/client_buffer.h"
162+#include "mir/client/client_buffer_factory.h"
163+#include "mir/client/client_buffer.h"
164 #include "mir/client/surface_map.h"
165 #include "buffer_vault.h"
166 #include "buffer.h"
167
168=== modified file 'src/client/default_connection_configuration.cpp'
169--- src/client/default_connection_configuration.cpp 2017-04-28 03:49:54 +0000
170+++ src/client/default_connection_configuration.cpp 2017-05-12 15:59:26 +0000
171@@ -33,7 +33,7 @@
172 #include "lttng/shared_library_prober_report.h"
173 #include "connection_surface_map.h"
174 #include "lifecycle_control.h"
175-#include "mir/client_platform_factory.h"
176+#include "mir/client/client_platform_factory.h"
177 #include "probing_client_platform_factory.h"
178 #include "mir_event_distributor.h"
179 #include "buffer_factory.h"
180
181=== modified file 'src/client/mir_buffer_api.cpp'
182--- src/client/mir_buffer_api.cpp 2017-04-28 03:49:54 +0000
183+++ src/client/mir_buffer_api.cpp 2017-05-12 15:59:26 +0000
184@@ -22,11 +22,10 @@
185 #include "presentation_chain.h"
186 #include "mir_connection.h"
187 #include "buffer.h"
188-#include "mir/client_buffer.h"
189+#include "mir/client/client_buffer.h"
190 #include "mir/require.h"
191 #include "mir/uncaught.h"
192 #include "mir/require.h"
193-#include "mir/client_buffer.h"
194 #include <stdexcept>
195 #include <boost/throw_exception.hpp>
196
197
198=== modified file 'src/client/mir_buffer_stream_api.cpp'
199--- src/client/mir_buffer_stream_api.cpp 2017-05-08 04:12:58 +0000
200+++ src/client/mir_buffer_stream_api.cpp 2017-05-12 15:59:26 +0000
201@@ -25,7 +25,7 @@
202 #include "render_surface.h"
203
204 #include "mir_toolkit/mir_buffer.h"
205-#include "mir/client_buffer.h"
206+#include "mir/client/client_buffer.h"
207
208 #include "mir/uncaught.h"
209 #include "mir/require.h"
210
211=== modified file 'src/client/mir_connection.cpp'
212--- src/client/mir_connection.cpp 2017-04-28 03:49:54 +0000
213+++ src/client/mir_connection.cpp 2017-05-12 15:59:26 +0000
214@@ -24,8 +24,8 @@
215 #include "mir_protobuf.pb.h"
216 #include "make_protobuf_object.h"
217 #include "mir_toolkit/mir_platform_message.h"
218-#include "mir/client_platform.h"
219-#include "mir/client_platform_factory.h"
220+#include "mir/client/client_platform.h"
221+#include "mir/client/client_platform_factory.h"
222 #include "rpc/mir_basic_rpc_channel.h"
223 #include "mir/dispatch/dispatchable.h"
224 #include "mir/dispatch/threaded_dispatcher.h"
225
226=== modified file 'src/client/mir_connection.h'
227--- src/client/mir_connection.h 2017-04-28 03:49:54 +0000
228+++ src/client/mir_connection.h 2017-05-12 15:59:26 +0000
229@@ -28,9 +28,9 @@
230 #include "mir_toolkit/extensions/window_coordinate_translation.h"
231 #include "mir_toolkit/extensions/graphics_module.h"
232 #include "mir/geometry/size.h"
233-#include "mir/client_platform.h"
234+#include "mir/client/client_platform.h"
235 #include "mir/frontend/surface_id.h"
236-#include "mir/client_context.h"
237+#include "mir/client/client_context.h"
238 #include "mir_toolkit/mir_client_library.h"
239 #include "mir_surface.h"
240 #include "display_configuration.h"
241
242=== modified file 'src/client/mir_surface.cpp'
243--- src/client/mir_surface.cpp 2017-04-28 03:49:54 +0000
244+++ src/client/mir_surface.cpp 2017-05-12 15:59:26 +0000
245@@ -26,7 +26,7 @@
246 #include "mir_toolkit/mir_client_library.h"
247 #include "mir_toolkit/mir_blob.h"
248 #include "mir/frontend/client_constants.h"
249-#include "mir/client_buffer.h"
250+#include "mir/client/client_buffer.h"
251 #include "mir/mir_buffer_stream.h"
252 #include "mir/dispatch/threaded_dispatcher.h"
253 #include "mir/input/xkb_mapper.h"
254
255=== modified file 'src/client/mir_surface.h'
256--- src/client/mir_surface.h 2017-04-28 03:49:54 +0000
257+++ src/client/mir_surface.h 2017-05-12 15:59:26 +0000
258@@ -25,7 +25,7 @@
259 #include "rpc/mir_display_server.h"
260 #include "rpc/mir_display_server_debug.h"
261
262-#include "mir/client_platform.h"
263+#include "mir/client/client_platform.h"
264 #include "mir/frontend/surface_id.h"
265 #include "mir/optional_value.h"
266 #include "mir/geometry/dimensions.h"
267
268=== modified file 'src/client/presentation_chain.cpp'
269--- src/client/presentation_chain.cpp 2017-04-28 03:49:54 +0000
270+++ src/client/presentation_chain.cpp 2017-05-12 15:59:26 +0000
271@@ -16,8 +16,8 @@
272 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
273 */
274
275-#include "mir/client_buffer_factory.h"
276-#include "mir/client_buffer.h"
277+#include "mir/client/client_buffer_factory.h"
278+#include "mir/client/client_buffer.h"
279 #include "rpc/mir_display_server.h"
280 #include "presentation_chain.h"
281 #include "protobuf_to_native_buffer.h"
282
283=== modified file 'src/client/probing_client_platform_factory.cpp'
284--- src/client/probing_client_platform_factory.cpp 2017-04-28 03:49:54 +0000
285+++ src/client/probing_client_platform_factory.cpp 2017-05-12 15:59:26 +0000
286@@ -1,5 +1,5 @@
287 #include "probing_client_platform_factory.h"
288-#include "mir/client_platform.h"
289+#include "mir/client/client_platform.h"
290 #include "mir/shared_library.h"
291 #include "mir/shared_library_prober.h"
292 #include "mir/shared_library_prober_report.h"
293
294=== modified file 'src/client/probing_client_platform_factory.h'
295--- src/client/probing_client_platform_factory.h 2017-04-28 03:49:54 +0000
296+++ src/client/probing_client_platform_factory.h 2017-05-12 15:59:26 +0000
297@@ -3,7 +3,7 @@
298
299 #include <vector>
300
301-#include "mir/client_platform_factory.h"
302+#include "mir/client/client_platform_factory.h"
303 #include "mir/shared_library.h"
304
305 namespace mir
306
307=== modified file 'src/client/render_surface.cpp'
308--- src/client/render_surface.cpp 2017-04-28 03:49:54 +0000
309+++ src/client/render_surface.cpp 2017-05-12 15:59:26 +0000
310@@ -22,7 +22,7 @@
311 #include "mir_wait_handle.h"
312 #include "rpc/mir_display_server.h"
313
314-#include "mir/client_platform.h"
315+#include "mir/client/client_platform.h"
316
317 #include <boost/throw_exception.hpp>
318
319
320=== modified file 'src/client/screencast_stream.cpp'
321--- src/client/screencast_stream.cpp 2017-05-08 04:12:58 +0000
322+++ src/client/screencast_stream.cpp 2017-05-12 15:59:26 +0000
323@@ -25,8 +25,8 @@
324 #include "protobuf_to_native_buffer.h"
325
326 #include "mir/log.h"
327-#include "mir/client_platform.h"
328-#include "mir/client_buffer_factory.h"
329+#include "mir/client/client_platform.h"
330+#include "mir/client/client_buffer_factory.h"
331 #include "mir/frontend/client_constants.h"
332 #include "mir_toolkit/mir_native_buffer.h"
333
334
335=== modified file 'src/client/screencast_stream.h'
336--- src/client/screencast_stream.h 2017-05-08 04:12:58 +0000
337+++ src/client/screencast_stream.h 2017-05-12 15:59:26 +0000
338@@ -20,8 +20,8 @@
339 #define MIR_CLIENT_SCREENCAST_STREAM_H
340
341 #include "mir_wait_handle.h"
342-#include "mir/egl_native_surface.h"
343-#include "mir/client_buffer.h"
344+#include "mir/client/egl_native_surface.h"
345+#include "mir/client/client_buffer.h"
346 #include "mir/mir_buffer_stream.h"
347 #include "mir/geometry/size.h"
348
349
350=== modified file 'src/platforms/CMakeLists.txt'
351--- src/platforms/CMakeLists.txt 2017-04-28 03:49:54 +0000
352+++ src/platforms/CMakeLists.txt 2017-05-12 15:59:26 +0000
353@@ -50,11 +50,13 @@
354 set(server_symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/common/server/symbols.map)
355
356 set(client_common_include_dirs
357+ ${PROJECT_SOURCE_DIR}/include/platform
358 ${PROJECT_SOURCE_DIR}/include/client
359 ${CMAKE_CURRENT_SOURCE_DIR}/common/client
360 )
361
362 # TODO client platform implementations shouldn't depend on private APIs
363+# - only needed for Hardware Buffer Stream in mesa client
364 set(client_common_include_dirs
365 ${client_common_include_dirs}
366 ${PROJECT_SOURCE_DIR}/src/include/client
367
368=== modified file 'src/platforms/common/client/mir/CMakeLists.txt'
369--- src/platforms/common/client/mir/CMakeLists.txt 2017-04-28 03:49:54 +0000
370+++ src/platforms/common/client/mir/CMakeLists.txt 2017-05-12 15:59:26 +0000
371@@ -1,4 +1,4 @@
372-include_directories(${PROJECT_SOURCE_DIR}/src/include/client)
373+include_directories(${PROJECT_SOURCE_DIR}/include/platform)
374 include_directories(${PROJECT_SOURCE_DIR}/include/client)
375
376 add_library(client_platform_common STATIC
377
378=== modified file 'src/platforms/common/client/mir/aging_buffer.h'
379--- src/platforms/common/client/mir/aging_buffer.h 2017-04-28 03:49:54 +0000
380+++ src/platforms/common/client/mir/aging_buffer.h 2017-05-12 15:59:26 +0000
381@@ -19,7 +19,7 @@
382 #ifndef MIR_CLIENT_AGING_BUFFER_H_
383 #define MIR_CLIENT_AGING_BUFFER_H_
384
385-#include "mir/client_buffer.h"
386+#include "mir/client/client_buffer.h"
387
388 namespace mir
389 {
390
391=== modified file 'src/platforms/eglstream-kms/client/client_buffer_factory.h'
392--- src/platforms/eglstream-kms/client/client_buffer_factory.h 2017-04-28 03:49:54 +0000
393+++ src/platforms/eglstream-kms/client/client_buffer_factory.h 2017-05-12 15:59:26 +0000
394@@ -20,7 +20,7 @@
395 #ifndef MIR_CLIENT_EGLSTREAM_CLIENT_BUFFER_FACTORY_H_
396 #define MIR_CLIENT_EGLSTREAM_CLIENT_BUFFER_FACTORY_H_
397
398-#include "mir/client_buffer_factory.h"
399+#include "mir/client/client_buffer_factory.h"
400
401 namespace mir
402 {
403
404=== modified file 'src/platforms/eglstream-kms/client/client_platform.cpp'
405--- src/platforms/eglstream-kms/client/client_platform.cpp 2017-04-28 03:49:54 +0000
406+++ src/platforms/eglstream-kms/client/client_platform.cpp 2017-05-12 15:59:26 +0000
407@@ -19,8 +19,8 @@
408 #include "mir_toolkit/mir_client_library.h"
409 #include "client_platform.h"
410 #include "client_buffer_factory.h"
411-#include "mir/client_buffer_factory.h"
412-#include "mir/client_context.h"
413+#include "mir/client/client_buffer_factory.h"
414+#include "mir/client/client_context.h"
415 #include "native_buffer.h"
416
417 #include <cstring>
418
419=== modified file 'src/platforms/eglstream-kms/client/client_platform.h'
420--- src/platforms/eglstream-kms/client/client_platform.h 2017-04-28 03:49:54 +0000
421+++ src/platforms/eglstream-kms/client/client_platform.h 2017-05-12 15:59:26 +0000
422@@ -18,7 +18,7 @@
423 #ifndef MIR_CLIENT_EGLSTREAM_CLIENT_PLATFORM_H_
424 #define MIR_CLIENT_EGLSTREAM_CLIENT_PLATFORM_H_
425
426-#include "mir/client_platform.h"
427+#include "mir/client/client_platform.h"
428
429 namespace mir
430 {
431
432=== modified file 'src/platforms/eglstream-kms/client/client_platform_factory.cpp'
433--- src/platforms/eglstream-kms/client/client_platform_factory.cpp 2017-04-28 03:49:54 +0000
434+++ src/platforms/eglstream-kms/client/client_platform_factory.cpp 2017-05-12 15:59:26 +0000
435@@ -16,11 +16,11 @@
436 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
437 */
438
439-#include "mir/client_platform_factory.h"
440+#include "mir/client/client_platform_factory.h"
441 #include "client_platform.h"
442 #include "mir_toolkit/client_types.h"
443-#include "mir/client_context.h"
444-#include "mir/egl_native_display_container.h"
445+#include "mir/client/client_context.h"
446+#include "mir/client/egl_native_display_container.h"
447 #include "mir/assert_module_entry_point.h"
448 #include "mir/module_deleter.h"
449
450
451=== modified file 'src/platforms/mesa/client/client_buffer_factory.h'
452--- src/platforms/mesa/client/client_buffer_factory.h 2017-04-28 03:49:54 +0000
453+++ src/platforms/mesa/client/client_buffer_factory.h 2017-05-12 15:59:26 +0000
454@@ -20,7 +20,7 @@
455 #ifndef MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_
456 #define MIR_CLIENT_MESA_CLIENT_BUFFER_FACTORY_H_
457
458-#include "mir/client_buffer_factory.h"
459+#include "mir/client/client_buffer_factory.h"
460
461 namespace mir
462 {
463
464=== modified file 'src/platforms/mesa/client/client_platform.cpp'
465--- src/platforms/mesa/client/client_platform.cpp 2017-05-03 08:16:12 +0000
466+++ src/platforms/mesa/client/client_platform.cpp 2017-05-12 15:59:26 +0000
467@@ -21,9 +21,9 @@
468 #include "client_buffer_factory.h"
469 #include "mesa_native_display_container.h"
470 #include "native_surface.h"
471-#include "mir/client_buffer_factory.h"
472-#include "mir/client_context.h"
473-#include "mir/client_buffer.h"
474+#include "mir/client/client_buffer_factory.h"
475+#include "mir/client/client_context.h"
476+#include "mir/client/client_buffer.h"
477 #include "mir/mir_render_surface.h"
478 #include "mir/mir_buffer.h"
479 #include "mir/weak_egl.h"
480
481=== modified file 'src/platforms/mesa/client/client_platform.h'
482--- src/platforms/mesa/client/client_platform.h 2017-04-28 03:49:54 +0000
483+++ src/platforms/mesa/client/client_platform.h 2017-05-12 15:59:26 +0000
484@@ -18,7 +18,7 @@
485 #ifndef MIR_CLIENT_MESA_CLIENT_PLATFORM_H_
486 #define MIR_CLIENT_MESA_CLIENT_PLATFORM_H_
487
488-#include "mir/client_platform.h"
489+#include "mir/client/client_platform.h"
490 #include "mir_toolkit/extensions/mesa_drm_auth.h"
491 #include "mir_toolkit/extensions/set_gbm_device.h"
492 #include "mir_toolkit/extensions/gbm_buffer.h"
493
494=== modified file 'src/platforms/mesa/client/client_platform_factory.cpp'
495--- src/platforms/mesa/client/client_platform_factory.cpp 2017-04-28 03:49:54 +0000
496+++ src/platforms/mesa/client/client_platform_factory.cpp 2017-05-12 15:59:26 +0000
497@@ -16,12 +16,12 @@
498 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
499 */
500
501-#include "mir/client_platform_factory.h"
502+#include "mir/client/client_platform_factory.h"
503 #include "client_platform.h"
504 #include "mir_toolkit/client_types.h"
505-#include "mir/client_context.h"
506+#include "mir/client/client_context.h"
507 #include "buffer_file_ops.h"
508-#include "mir/egl_native_display_container.h"
509+#include "mir/client/egl_native_display_container.h"
510 #include "mir/assert_module_entry_point.h"
511 #include "mir/module_deleter.h"
512
513
514=== modified file 'src/platforms/mesa/client/mesa_native_display_container.cpp'
515--- src/platforms/mesa/client/mesa_native_display_container.cpp 2015-02-22 07:46:25 +0000
516+++ src/platforms/mesa/client/mesa_native_display_container.cpp 2017-05-12 15:59:26 +0000
517@@ -18,7 +18,7 @@
518
519 #include "mesa_native_display_container.h"
520
521-#include "mir/client_platform.h"
522+#include "mir/client/client_platform.h"
523
524 #include <cstring>
525 #include <unordered_set>
526
527=== modified file 'src/platforms/mesa/client/mesa_native_display_container.h'
528--- src/platforms/mesa/client/mesa_native_display_container.h 2015-02-22 07:46:25 +0000
529+++ src/platforms/mesa/client/mesa_native_display_container.h 2017-05-12 15:59:26 +0000
530@@ -19,7 +19,7 @@
531 #ifndef MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_
532 #define MIR_CLIENT_MESA_MESA_NATIVE_DISPLAY_CONTAINER_H_
533
534-#include "mir/egl_native_display_container.h"
535+#include "mir/client/egl_native_display_container.h"
536
537 #include "mir_toolkit/client_types.h"
538 #include "mir_toolkit/mesa/native_display.h"
539
540=== modified file 'src/platforms/mesa/client/native_surface.cpp'
541--- src/platforms/mesa/client/native_surface.cpp 2017-04-28 03:49:54 +0000
542+++ src/platforms/mesa/client/native_surface.cpp 2017-05-12 15:59:26 +0000
543@@ -21,7 +21,7 @@
544 #include <cstring>
545
546 #include "native_buffer.h"
547-#include "mir/client_buffer.h"
548+#include "mir/client/client_buffer.h"
549 #include "mir/uncaught.h"
550
551 #include "native_surface.h"
552
553=== modified file 'src/platforms/mesa/client/native_surface.h'
554--- src/platforms/mesa/client/native_surface.h 2017-04-28 03:49:54 +0000
555+++ src/platforms/mesa/client/native_surface.h 2017-05-12 15:59:26 +0000
556@@ -20,7 +20,7 @@
557 #define MIR_CLIENT_MESA_NATIVE_SURFACES_H_
558
559 #include "mir_toolkit/mesa/native_display.h"
560-#include "mir/egl_native_surface.h"
561+#include "mir/client/egl_native_surface.h"
562
563 namespace mir
564 {
565
566=== modified file 'tests/acceptance-tests/test_client_library_errors.cpp'
567--- tests/acceptance-tests/test_client_library_errors.cpp 2017-04-28 03:49:54 +0000
568+++ tests/acceptance-tests/test_client_library_errors.cpp 2017-05-12 15:59:26 +0000
569@@ -22,9 +22,9 @@
570 #include "mir_toolkit/mir_screencast.h"
571 #include "mir_toolkit/debug/surface.h"
572
573-#include "src/include/client/mir/client_platform_factory.h"
574-#include "src/include/client/mir/client_platform.h"
575-#include "src/include/client/mir/client_buffer_factory.h"
576+#include "mir/client/client_platform_factory.h"
577+#include "mir/client/client_platform.h"
578+#include "mir/client/client_buffer_factory.h"
579
580 #include "mir/test/validity_matchers.h"
581 #include "mir/test/death.h"
582
583=== modified file 'tests/include/mir/test/doubles/mock_client_buffer_factory.h'
584--- tests/include/mir/test/doubles/mock_client_buffer_factory.h 2017-04-28 03:49:54 +0000
585+++ tests/include/mir/test/doubles/mock_client_buffer_factory.h 2017-05-12 15:59:26 +0000
586@@ -19,7 +19,7 @@
587 #ifndef MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_FACTORY_H_
588 #define MIR_TEST_DOUBLES_MOCK_CLIENT_BUFFER_FACTORY_H_
589
590-#include "mir/client_buffer_factory.h"
591+#include "mir/client/client_buffer_factory.h"
592
593 #include <gtest/gtest.h>
594 #include <gmock/gmock.h>
595
596=== modified file 'tests/include/mir/test/doubles/mock_client_platform.h'
597--- tests/include/mir/test/doubles/mock_client_platform.h 2017-04-13 07:00:27 +0000
598+++ tests/include/mir/test/doubles/mock_client_platform.h 2017-05-12 15:59:26 +0000
599@@ -20,8 +20,8 @@
600 #define MIR_TEST_DOUBLES_MOCK_CLIENT_PLATFOM_H_
601
602 #include "stub_client_buffer_factory.h"
603-#include "mir/client_platform.h"
604-#include "mir/client_platform_factory.h"
605+#include "mir/client/client_platform.h"
606+#include "mir/client/client_platform_factory.h"
607 #include <gmock/gmock.h>
608
609 namespace mir
610
611=== modified file 'tests/include/mir/test/doubles/mock_mir_buffer.h'
612--- tests/include/mir/test/doubles/mock_mir_buffer.h 2017-04-28 03:49:54 +0000
613+++ tests/include/mir/test/doubles/mock_mir_buffer.h 2017-05-12 15:59:26 +0000
614@@ -19,7 +19,7 @@
615 #ifndef MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_H_
616 #define MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_H_
617
618-#include "src/include/client/mir/mir_buffer.h"
619+#include "mir/mir_buffer.h"
620
621 #include <gtest/gtest.h>
622 #include <gmock/gmock.h>
623
624=== modified file 'tests/include/mir/test/doubles/mock_mir_buffer_stream.h'
625--- tests/include/mir/test/doubles/mock_mir_buffer_stream.h 2017-05-08 04:12:58 +0000
626+++ tests/include/mir/test/doubles/mock_mir_buffer_stream.h 2017-05-12 15:59:26 +0000
627@@ -19,7 +19,7 @@
628 #ifndef MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_STREAM_H_
629 #define MIR_TEST_DOUBLES_MOCK_MIR_BUFFER_STREAM_H_
630
631-#include "src/include/client/mir/mir_buffer_stream.h"
632+#include "mir/mir_buffer_stream.h"
633
634 #include <gmock/gmock.h>
635
636
637=== modified file 'tests/include/mir/test/doubles/null_client_buffer.h'
638--- tests/include/mir/test/doubles/null_client_buffer.h 2017-04-28 03:49:54 +0000
639+++ tests/include/mir/test/doubles/null_client_buffer.h 2017-05-12 15:59:26 +0000
640@@ -19,7 +19,7 @@
641 #ifndef MIR_TEST_DOUBLES_NULL_CLIENT_BUFFER_H_
642 #define MIR_TEST_DOUBLES_NULL_CLIENT_BUFFER_H_
643
644-#include "mir/client_buffer.h"
645+#include "mir/client/client_buffer.h"
646
647 namespace mir
648 {
649
650=== modified file 'tests/include/mir/test/doubles/stub_client_buffer.h'
651--- tests/include/mir/test/doubles/stub_client_buffer.h 2017-04-28 03:49:54 +0000
652+++ tests/include/mir/test/doubles/stub_client_buffer.h 2017-05-12 15:59:26 +0000
653@@ -19,7 +19,7 @@
654 #ifndef MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_H_
655 #define MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_H_
656
657-#include "src/include/client/mir/client_buffer.h"
658+#include "mir/client/client_buffer.h"
659 #include <unistd.h>
660
661 namespace mir
662
663=== modified file 'tests/include/mir/test/doubles/stub_client_buffer_factory.h'
664--- tests/include/mir/test/doubles/stub_client_buffer_factory.h 2017-04-28 03:49:54 +0000
665+++ tests/include/mir/test/doubles/stub_client_buffer_factory.h 2017-05-12 15:59:26 +0000
666@@ -19,7 +19,7 @@
667 #ifndef MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_FACTORY_H_
668 #define MIR_TEST_DOUBLES_STUB_CLIENT_BUFFER_FACTORY_H_
669
670-#include "src/include/client/mir/client_buffer_factory.h"
671+#include "mir/client/client_buffer_factory.h"
672 #include "stub_client_buffer.h"
673
674 namespace mir
675
676=== modified file 'tests/include/mir/test/doubles/stub_client_platform_factory.h'
677--- tests/include/mir/test/doubles/stub_client_platform_factory.h 2017-02-14 15:09:24 +0000
678+++ tests/include/mir/test/doubles/stub_client_platform_factory.h 2017-05-12 15:59:26 +0000
679@@ -19,7 +19,7 @@
680 #ifndef MIR_TEST_DOUBLES_STUB_CLIENT_PLATFORM_FACTORY_H_
681 #define MIR_TEST_DOUBLES_STUB_CLIENT_PLATFORM_FACTORY_H_
682
683-#include "mir/client_platform_factory.h"
684+#include "mir/client/client_platform_factory.h"
685
686 namespace mir
687 {
688
689=== modified file 'tests/include/mir_test_framework/client_platform_factory.h'
690--- tests/include/mir_test_framework/client_platform_factory.h 2017-04-28 03:49:54 +0000
691+++ tests/include/mir_test_framework/client_platform_factory.h 2017-05-12 15:59:26 +0000
692@@ -21,7 +21,7 @@
693
694
695 #include "mir/shared_library.h"
696-#include "mir/client_platform_factory.h"
697+#include "mir/client/client_platform_factory.h"
698 #include "mir_test_framework/executable_path.h"
699 #include "mir/test/doubles/mock_client_context.h"
700
701
702=== modified file 'tests/include/mir_test_framework/stub_client_platform_factory.h'
703--- tests/include/mir_test_framework/stub_client_platform_factory.h 2017-04-28 03:49:54 +0000
704+++ tests/include/mir_test_framework/stub_client_platform_factory.h 2017-05-12 15:59:26 +0000
705@@ -19,8 +19,8 @@
706 #ifndef MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_
707 #define MIR_TEST_FRAMEWORK_STUB_CLIENT_PLATFORM_FACTORY_
708
709-#include "mir/client_platform_factory.h"
710-#include "mir/client_platform.h"
711+#include "mir/client/client_platform_factory.h"
712+#include "mir/client/client_platform.h"
713 #include "mir_toolkit/mir_native_buffer.h"
714 #include "mir_toolkit/extensions/fenced_buffers.h"
715 #include "mir_toolkit/extensions/gbm_buffer.h"
716
717=== modified file 'tests/mir_test_doubles/mock_egl.cpp'
718--- tests/mir_test_doubles/mock_egl.cpp 2017-04-28 03:49:54 +0000
719+++ tests/mir_test_doubles/mock_egl.cpp 2017-05-12 15:59:26 +0000
720@@ -18,7 +18,7 @@
721 * Kevin DuBois <kevin.dubois@canonical.com>
722 */
723
724-#include "mir/egl_native_surface.h"
725+#include "mir/client/egl_native_surface.h"
726
727 #include "mir/test/doubles/mock_egl.h"
728 #include <gtest/gtest.h>
729
730=== modified file 'tests/mir_test_framework/stub_client_platform_factory.cpp'
731--- tests/mir_test_framework/stub_client_platform_factory.cpp 2017-04-28 03:49:54 +0000
732+++ tests/mir_test_framework/stub_client_platform_factory.cpp 2017-05-12 15:59:26 +0000
733@@ -18,9 +18,9 @@
734
735 #include "mir_test_framework/stub_client_platform_factory.h"
736 #include "mir/test/doubles/stub_client_buffer_factory.h"
737-#include "mir/client_buffer_factory.h"
738-#include "mir/client_buffer.h"
739-#include "mir/client_context.h"
740+#include "mir/client/client_buffer_factory.h"
741+#include "mir/client/client_buffer.h"
742+#include "mir/client/client_context.h"
743 #include "mir_test_framework/stub_platform_native_buffer.h"
744 #include "mir_test_framework/stub_platform_extension.h"
745 #include "mir_toolkit/mir_native_buffer.h"
746
747=== modified file 'tests/mir_test_framework/stub_client_platform_module.cpp'
748--- tests/mir_test_framework/stub_client_platform_module.cpp 2017-04-28 03:49:54 +0000
749+++ tests/mir_test_framework/stub_client_platform_module.cpp 2017-05-12 15:59:26 +0000
750@@ -16,8 +16,8 @@
751 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>>
752 */
753
754-#include "src/include/client/mir/client_platform_factory.h"
755-#include "src/include/client/mir/client_context.h"
756+#include "mir/client/client_platform_factory.h"
757+#include "mir/client/client_context.h"
758
759 #include "mir_test_framework/stub_client_platform_factory.h"
760 #include "mir_test_framework/stub_platform_helpers.h"
761
762=== modified file 'tests/unit-tests/client/test_buffer_vault.cpp'
763--- tests/unit-tests/client/test_buffer_vault.cpp 2017-04-28 03:49:54 +0000
764+++ tests/unit-tests/client/test_buffer_vault.cpp 2017-05-12 15:59:26 +0000
765@@ -20,7 +20,7 @@
766 #include "src/client/buffer_vault.h"
767 #include "src/client/buffer_factory.h"
768 #include "src/client/connection_surface_map.h"
769-#include "mir/client_buffer_factory.h"
770+#include "mir/client/client_buffer_factory.h"
771 #include "mir/aging_buffer.h"
772 #include "mir_toolkit/common.h"
773 #include "mir/geometry/size.h"
774
775=== modified file 'tests/unit-tests/client/test_client_buffer_stream.cpp'
776--- tests/unit-tests/client/test_client_buffer_stream.cpp 2017-04-28 03:49:54 +0000
777+++ tests/unit-tests/client/test_client_buffer_stream.cpp 2017-05-12 15:59:26 +0000
778@@ -23,7 +23,7 @@
779 #include "src/client/buffer_factory.h"
780 #include "src/client/protobuf_to_native_buffer.h"
781
782-#include "mir/client_platform.h"
783+#include "mir/client/client_platform.h"
784
785 #include "mir/test/doubles/null_client_buffer.h"
786 #include "mir/test/doubles/mock_client_buffer_factory.h"
787
788=== modified file 'tests/unit-tests/client/test_client_mir_surface.cpp'
789--- tests/unit-tests/client/test_client_mir_surface.cpp 2017-04-28 03:49:54 +0000
790+++ tests/unit-tests/client/test_client_mir_surface.cpp 2017-05-12 15:59:26 +0000
791@@ -22,10 +22,10 @@
792
793 #include "mir_protobuf.pb.h"
794 #include "mir_toolkit/mir_client_library.h"
795-#include "mir/client_buffer.h"
796-#include "mir/client_buffer_factory.h"
797-#include "mir/client_platform.h"
798-#include "mir/client_platform_factory.h"
799+#include "mir/client/client_buffer.h"
800+#include "mir/client/client_buffer_factory.h"
801+#include "mir/client/client_platform.h"
802+#include "mir/client/client_platform_factory.h"
803 #include "src/client/mir_surface.h"
804 #include "src/client/mir_connection.h"
805 #include "src/client/default_connection_configuration.h"
806
807=== modified file 'tests/unit-tests/client/test_client_platform.cpp'
808--- tests/unit-tests/client/test_client_platform.cpp 2017-04-28 03:49:54 +0000
809+++ tests/unit-tests/client/test_client_platform.cpp 2017-05-12 15:59:26 +0000
810@@ -16,15 +16,15 @@
811 * Authored by: Kevin DuBois <kevin.dubois@canonical.com>
812 */
813
814-#include "mir/client_platform.h"
815-#include "mir/egl_native_surface.h"
816+#include "mir/client/client_platform.h"
817+#include "mir/client/egl_native_surface.h"
818
819 #include "mir/test/doubles/mock_client_context.h"
820 #include "mir/test/doubles/mock_egl_native_surface.h"
821 #include "mir_test_framework/executable_path.h"
822 #include "mir_test_framework/stub_platform_helpers.h"
823
824-#include "mir/client_platform_factory.h"
825+#include "mir/client/client_platform_factory.h"
826
827 #include "mir/shared_library.h"
828
829
830=== modified file 'tests/unit-tests/client/test_mir_connection.cpp'
831--- tests/unit-tests/client/test_mir_connection.cpp 2017-04-28 03:49:54 +0000
832+++ tests/unit-tests/client/test_mir_connection.cpp 2017-05-12 15:59:26 +0000
833@@ -25,9 +25,9 @@
834 #include "src/client/connection_surface_map.h"
835 #include "src/client/presentation_chain.h"
836
837-#include "mir/client_platform.h"
838-#include "mir/client_platform_factory.h"
839-#include "mir/client_buffer_factory.h"
840+#include "mir/client/client_platform.h"
841+#include "mir/client/client_platform_factory.h"
842+#include "mir/client/client_buffer_factory.h"
843 #include "mir/raii.h"
844 #include "mir/dispatch/dispatchable.h"
845 #include "mir/events/event_builders.h"
846
847=== modified file 'tests/unit-tests/client/test_mir_render_surface.cpp'
848--- tests/unit-tests/client/test_mir_render_surface.cpp 2017-04-28 03:49:54 +0000
849+++ tests/unit-tests/client/test_mir_render_surface.cpp 2017-05-12 15:59:26 +0000
850@@ -23,7 +23,7 @@
851 #include "src/client/connection_surface_map.h"
852 #include "src/client/mir_wait_handle.h"
853
854-#include "mir/client_platform_factory.h"
855+#include "mir/client/client_platform_factory.h"
856 #include "mir/dispatch/dispatchable.h"
857
858 #include "mir/test/fake_shared.h"
859
860=== modified file 'tests/unit-tests/client/test_mir_screencast.cpp'
861--- tests/unit-tests/client/test_mir_screencast.cpp 2017-04-28 03:49:54 +0000
862+++ tests/unit-tests/client/test_mir_screencast.cpp 2017-05-12 15:59:26 +0000
863@@ -19,8 +19,8 @@
864 #include "src/client/mir_screencast.h"
865 #include "src/client/rpc/mir_display_server.h"
866
867-#include "mir/client_buffer_factory.h"
868-#include "mir/client_platform.h"
869+#include "mir/client/client_buffer_factory.h"
870+#include "mir/client/client_platform.h"
871
872 #include "mir/test/doubles/mock_mir_buffer_stream.h"
873 #include "mir/test/doubles/null_client_buffer.h"
874
875=== modified file 'tests/unit-tests/client/test_presentation_chain.cpp'
876--- tests/unit-tests/client/test_presentation_chain.cpp 2017-04-28 03:49:54 +0000
877+++ tests/unit-tests/client/test_presentation_chain.cpp 2017-05-12 15:59:26 +0000
878@@ -22,7 +22,7 @@
879 #include "mir/test/fake_shared.h"
880 #include "src/client/presentation_chain.h"
881 #include "src/client/buffer_factory.h"
882-#include "mir/client_buffer_factory.h"
883+#include "mir/client/client_buffer_factory.h"
884
885 #include <mutex>
886 #include <condition_variable>
887
888=== modified file 'tests/unit-tests/client/test_probing_client_platform_factory.cpp'
889--- tests/unit-tests/client/test_probing_client_platform_factory.cpp 2017-04-28 03:49:54 +0000
890+++ tests/unit-tests/client/test_probing_client_platform_factory.cpp 2017-05-12 15:59:26 +0000
891@@ -16,7 +16,7 @@
892 * Authored by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
893 */
894
895-#include "mir/client_platform.h"
896+#include "mir/client/client_platform.h"
897 #include "src/client/probing_client_platform_factory.h"
898 #include "src/server/report/null_report_factory.h"
899
900
901=== modified file 'tests/unit-tests/client/test_screencast_stream.cpp'
902--- tests/unit-tests/client/test_screencast_stream.cpp 2017-04-28 03:49:54 +0000
903+++ tests/unit-tests/client/test_screencast_stream.cpp 2017-05-12 15:59:26 +0000
904@@ -17,7 +17,7 @@
905 */
906
907 #include "src/client/screencast_stream.h"
908-#include "mir/client_platform.h"
909+#include "mir/client/client_platform.h"
910 #include "mir/test/doubles/null_client_buffer.h"
911 #include "mir/test/doubles/mock_client_buffer_factory.h"
912 #include "mir/test/doubles/mock_protobuf_server.h"
913
914=== modified file 'tests/unit-tests/platforms/mesa/client/test_client_platform.cpp'
915--- tests/unit-tests/platforms/mesa/client/test_client_platform.cpp 2017-04-28 03:49:54 +0000
916+++ tests/unit-tests/platforms/mesa/client/test_client_platform.cpp 2017-05-12 15:59:26 +0000
917@@ -16,7 +16,7 @@
918 * Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
919 */
920
921-#include "mir/client_platform.h"
922+#include "mir/client/client_platform.h"
923 #include "mir/shared_library.h"
924 #include "mir/raii.h"
925 #include "src/platforms/mesa/client/buffer_file_ops.h"
926
927=== modified file 'tests/unit-tests/platforms/mesa/client/test_native_surface.cpp'
928--- tests/unit-tests/platforms/mesa/client/test_native_surface.cpp 2017-04-28 03:49:54 +0000
929+++ tests/unit-tests/platforms/mesa/client/test_native_surface.cpp 2017-05-12 15:59:26 +0000
930@@ -18,7 +18,7 @@
931
932 #include "src/platforms/mesa/include/native_buffer.h"
933 #include "src/platforms/mesa/client/native_surface.h"
934-#include "mir/client_buffer.h"
935+#include "mir/client/client_buffer.h"
936 #include "mir/test/doubles/mock_egl_native_surface.h"
937 #include "mir/test/doubles/mock_client_buffer.h"
938 #include "mir/test/fake_shared.h"

Subscribers

People subscribed via source and target branches