Mir

Merge lp:~alan-griffiths/mir/dont-deprecate-RenderSurfaces into lp:mir

Proposed by Alan Griffiths on 2017-05-26
Status: Merged
Approved by: Gerry Boland on 2017-05-26
Approved revision: 4178
Merged at revision: 4177
Proposed branch: lp:~alan-griffiths/mir/dont-deprecate-RenderSurfaces
Merge into: lp:mir
Diff against target: 147 lines (+16/-18)
2 files modified
examples/CMakeLists.txt (+0/-2)
include/client/mir_toolkit/rs/mir_render_surface.h (+16/-16)
To merge this branch: bzr merge lp:~alan-griffiths/mir/dont-deprecate-RenderSurfaces
Reviewer Review Type Date Requested Status
Mir CI Bot continuous-integration Approve on 2017-05-26
Gerry Boland 2017-05-26 Approve on 2017-05-26
Review via email: mp+324660@code.launchpad.net

Commit message

Don't deprecate RenderSurfaces (yet)

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

ok

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

PASSED: Continuous integration, rev:4178
https://mir-jenkins.ubuntu.com/job/mir-ci/3419/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4653
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4786
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4776
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4776
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4776
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4689/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4689
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4689/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3419/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'examples/CMakeLists.txt'
2--- examples/CMakeLists.txt 2017-05-19 13:49:04 +0000
3+++ examples/CMakeLists.txt 2017-05-26 09:03:00 +0000
4@@ -1,5 +1,3 @@
5-add_definitions(-DMIR_DEPRECATE_RENDERSURFACES=0)
6-
7 mir_add_wrapped_executable(mir_demo_standalone_render_surfaces
8 render_surfaces.cpp
9 buffer_render_target.cpp
10
11=== modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
12--- include/client/mir_toolkit/rs/mir_render_surface.h 2017-05-23 00:22:04 +0000
13+++ include/client/mir_toolkit/rs/mir_render_surface.h 2017-05-26 09:03:00 +0000
14@@ -24,14 +24,14 @@
15 #include <mir_toolkit/deprecations.h>
16
17 #ifndef MIR_DEPRECATE_RENDERSURFACES
18- #define MIR_DEPRECATE_RENDERSURFACES 1
19+ #define MIR_DEPRECATE_RENDERSURFACES 0
20 #endif
21
22 #if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 0
23- #define MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1\
24+ #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME\
25 __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))
26 #else
27- #define MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1
28+ #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME
29 #endif
30
31 #ifdef __cplusplus
32@@ -43,7 +43,7 @@
33 #endif
34
35 typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
36-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
37+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
38
39 #pragma GCC diagnostic push
40 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
41@@ -64,7 +64,7 @@
42 int width, int height,
43 MirRenderSurfaceCallback callback,
44 void* context)
45-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
46+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
47
48 /**
49 * Create a render surface and wait for the result
50@@ -79,7 +79,7 @@
51 MirRenderSurface* mir_connection_create_render_surface_sync(
52 MirConnection* connection,
53 int width, int height)
54-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
55+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
56
57 /**
58 * Get the size of the MirRenderSurface
59@@ -91,7 +91,7 @@
60 void mir_render_surface_get_size(
61 MirRenderSurface* render_surface,
62 int* width, int* height)
63-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
64+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
65
66 /**
67 * Set the size of the MirRenderSurface
68@@ -103,7 +103,7 @@
69 void mir_render_surface_set_size(
70 MirRenderSurface* render_surface,
71 int width, int height)
72-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
73+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
74
75 /**
76 * Test for a valid render surface
77@@ -115,7 +115,7 @@
78 */
79 bool mir_render_surface_is_valid(
80 MirRenderSurface* render_surface)
81-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
82+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
83
84 /**
85 * Retrieve a text description of the error. The returned string is owned by
86@@ -128,7 +128,7 @@
87 */
88 char const *mir_render_surface_get_error_message(
89 MirRenderSurface* render_surface)
90-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
91+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
92
93 /**
94 * Release the specified render surface
95@@ -137,7 +137,7 @@
96 */
97 void mir_render_surface_release(
98 MirRenderSurface* render_surface)
99-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
100+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
101
102 /**
103 * Obtain the buffer stream backing a given render surface.
104@@ -157,7 +157,7 @@
105 MirRenderSurface* render_surface,
106 int width, int height,
107 MirPixelFormat format)
108-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
109+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
110
111 /**
112 * Obtain the presentation chain backing a given render surface.
113@@ -170,7 +170,7 @@
114 */
115 MirPresentationChain* mir_render_surface_get_presentation_chain(
116 MirRenderSurface* render_surface)
117-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
118+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
119
120 /** Query whether the server supports a given presentation mode.
121 *
122@@ -204,7 +204,7 @@
123 MirWindowSpec* spec,
124 MirRenderSurface* render_surface,
125 int hotspot_x, int hotspot_y)
126-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
127+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
128
129 /**
130 * Returns a new cursor configuration tied to a given render surface.
131@@ -219,7 +219,7 @@
132 MirCursorConfiguration* mir_cursor_configuration_from_render_surface(
133 MirRenderSurface* surface,
134 int hotspot_x, int hotspot_y)
135-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
136+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
137
138
139 /**
140@@ -242,7 +242,7 @@
141 MirRenderSurface* render_surface,
142 int logical_width, int logical_height,
143 int displacement_x, int displacement_y)
144-MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;
145+MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
146
147 #pragma GCC diagnostic pop
148

Subscribers

People subscribed via source and target branches