Mir

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

  1. dont-deprecate-RenderSurfaces
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Gerry Boland
Approved revision: no longer in the source branch.
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
Gerry Boland (community) Approve
Review via email: mp+324660@code.launchpad.net

Commit message

Don't deprecate RenderSurfaces (yet)

To post a comment you must log in.
Revision history for this message
Gerry Boland (gerboland) wrote :

ok

review: Approve
Revision history for this message
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
=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt 2017-05-19 13:49:04 +0000
+++ examples/CMakeLists.txt 2017-05-26 09:03:00 +0000
@@ -1,5 +1,3 @@
1add_definitions(-DMIR_DEPRECATE_RENDERSURFACES=0)
2
3mir_add_wrapped_executable(mir_demo_standalone_render_surfaces1mir_add_wrapped_executable(mir_demo_standalone_render_surfaces
4 render_surfaces.cpp2 render_surfaces.cpp
5 buffer_render_target.cpp3 buffer_render_target.cpp
64
=== modified file 'include/client/mir_toolkit/rs/mir_render_surface.h'
--- include/client/mir_toolkit/rs/mir_render_surface.h 2017-05-23 00:22:04 +0000
+++ include/client/mir_toolkit/rs/mir_render_surface.h 2017-05-26 09:03:00 +0000
@@ -24,14 +24,14 @@
24#include <mir_toolkit/deprecations.h>24#include <mir_toolkit/deprecations.h>
2525
26#ifndef MIR_DEPRECATE_RENDERSURFACES26#ifndef MIR_DEPRECATE_RENDERSURFACES
27 #define MIR_DEPRECATE_RENDERSURFACES 127 #define MIR_DEPRECATE_RENDERSURFACES 0
28#endif28#endif
2929
30#if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 030#if MIR_ENABLE_DEPRECATIONS > 0 && MIR_DEPRECATE_RENDERSURFACES > 0
31 #define MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1\31 #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME\
32 __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))32 __attribute__((deprecated("This function is slated for rename due to MirRenderSurface-->MirSurface transition")))
33#else33#else
34 #define MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_134 #define MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME
35#endif35#endif
3636
37#ifdef __cplusplus37#ifdef __cplusplus
@@ -43,7 +43,7 @@
43#endif43#endif
4444
45typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)45typedef void (*MirRenderSurfaceCallback)(MirRenderSurface*, void* context)
46MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;46MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
4747
48#pragma GCC diagnostic push48#pragma GCC diagnostic push
49#pragma GCC diagnostic ignored "-Wdeprecated-declarations"49#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -64,7 +64,7 @@
64 int width, int height,64 int width, int height,
65 MirRenderSurfaceCallback callback,65 MirRenderSurfaceCallback callback,
66 void* context)66 void* context)
67MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;67MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
6868
69/**69/**
70 * Create a render surface and wait for the result70 * Create a render surface and wait for the result
@@ -79,7 +79,7 @@
79MirRenderSurface* mir_connection_create_render_surface_sync(79MirRenderSurface* mir_connection_create_render_surface_sync(
80 MirConnection* connection,80 MirConnection* connection,
81 int width, int height)81 int width, int height)
82MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;82MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
8383
84/**84/**
85 * Get the size of the MirRenderSurface85 * Get the size of the MirRenderSurface
@@ -91,7 +91,7 @@
91void mir_render_surface_get_size(91void mir_render_surface_get_size(
92 MirRenderSurface* render_surface,92 MirRenderSurface* render_surface,
93 int* width, int* height)93 int* width, int* height)
94MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;94MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
9595
96/**96/**
97 * Set the size of the MirRenderSurface97 * Set the size of the MirRenderSurface
@@ -103,7 +103,7 @@
103void mir_render_surface_set_size(103void mir_render_surface_set_size(
104 MirRenderSurface* render_surface,104 MirRenderSurface* render_surface,
105 int width, int height)105 int width, int height)
106MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;106MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
107107
108/**108/**
109 * Test for a valid render surface109 * Test for a valid render surface
@@ -115,7 +115,7 @@
115 */115 */
116bool mir_render_surface_is_valid(116bool mir_render_surface_is_valid(
117 MirRenderSurface* render_surface)117 MirRenderSurface* render_surface)
118MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;118MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
119119
120/**120/**
121 * Retrieve a text description of the error. The returned string is owned by121 * Retrieve a text description of the error. The returned string is owned by
@@ -128,7 +128,7 @@
128 */128 */
129char const *mir_render_surface_get_error_message(129char const *mir_render_surface_get_error_message(
130 MirRenderSurface* render_surface)130 MirRenderSurface* render_surface)
131MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;131MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
132132
133/**133/**
134 * Release the specified render surface134 * Release the specified render surface
@@ -137,7 +137,7 @@
137 */137 */
138void mir_render_surface_release(138void mir_render_surface_release(
139 MirRenderSurface* render_surface)139 MirRenderSurface* render_surface)
140MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;140MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
141141
142/**142/**
143 * Obtain the buffer stream backing a given render surface.143 * Obtain the buffer stream backing a given render surface.
@@ -157,7 +157,7 @@
157 MirRenderSurface* render_surface,157 MirRenderSurface* render_surface,
158 int width, int height,158 int width, int height,
159 MirPixelFormat format)159 MirPixelFormat format)
160MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;160MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
161161
162/**162/**
163 * Obtain the presentation chain backing a given render surface.163 * Obtain the presentation chain backing a given render surface.
@@ -170,7 +170,7 @@
170 */170 */
171MirPresentationChain* mir_render_surface_get_presentation_chain(171MirPresentationChain* mir_render_surface_get_presentation_chain(
172 MirRenderSurface* render_surface)172 MirRenderSurface* render_surface)
173MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;173MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
174174
175/** Query whether the server supports a given presentation mode.175/** Query whether the server supports a given presentation mode.
176 *176 *
@@ -204,7 +204,7 @@
204 MirWindowSpec* spec,204 MirWindowSpec* spec,
205 MirRenderSurface* render_surface,205 MirRenderSurface* render_surface,
206 int hotspot_x, int hotspot_y)206 int hotspot_x, int hotspot_y)
207MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;207MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
208208
209/**209/**
210 * Returns a new cursor configuration tied to a given render surface.210 * Returns a new cursor configuration tied to a given render surface.
@@ -219,7 +219,7 @@
219MirCursorConfiguration* mir_cursor_configuration_from_render_surface(219MirCursorConfiguration* mir_cursor_configuration_from_render_surface(
220 MirRenderSurface* surface,220 MirRenderSurface* surface,
221 int hotspot_x, int hotspot_y)221 int hotspot_x, int hotspot_y)
222MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;222MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
223223
224224
225/**225/**
@@ -242,7 +242,7 @@
242 MirRenderSurface* render_surface,242 MirRenderSurface* render_surface,
243 int logical_width, int logical_height,243 int logical_width, int logical_height,
244 int displacement_x, int displacement_y)244 int displacement_x, int displacement_y)
245MIR_RENDERSURFACES_FOR_RENAME_IN_VERSION_1;245MIR_DEPRECATE_RENDERSURFACES_FOR_RENAME;
246246
247#pragma GCC diagnostic pop247#pragma GCC diagnostic pop
248248

Subscribers

People subscribed via source and target branches