Merge lp:~alan-griffiths/mir/port-examples-off-obsolete-APIs into lp:mir

[Alan Griffiths]

Complete the migration of example code to the render surfaces APIs in client_helpers.cpp

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4174
https://mir-jenkins.ubuntu.com/job/mir-ci/3408/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4636
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4765
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4754
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4754
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4668
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4668/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4668
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4668/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4668
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4668/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/4668
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4668/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4668
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4668/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Andreas Pokorny (andreas-pokorny)]

lgtm

review: Approve

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'examples/client_helpers.cpp'
--- examples/client_helpers.cpp	2017-05-19 09:51:35 +0000
+++ examples/client_helpers.cpp	2017-05-23 10:53:07 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2015 Canonical Ltd.
+ * Copyright © 2015-2017 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -18,12 +18,6 @@
 
 #include "client_helpers.h"
 #include "mir_toolkit/mir_client_library.h"
-#include <thread>
-#include <chrono>
-#include <iostream>
-#include <cstring>
-#include <unistd.h>
-#include <signal.h>
 
 namespace me = mir::examples;
 
@@ -51,10 +45,14 @@
     return connection;
 }
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-me::NormalWindow::NormalWindow(me::Connection& connection, unsigned int width, unsigned int height, bool prefers_alpha, bool hardware) :
-    window{create_window(connection, width, height, prefers_alpha, hardware), window_deleter}
+me::NormalWindow::NormalWindow(me::Connection& connection, unsigned int width, unsigned int height) :
+    window{create_window(connection, width, height, nullptr), &mir_window_release_sync}
+{
+}
+
+mir::examples::NormalWindow::NormalWindow(
+    mir::examples::Connection& connection, unsigned int width, unsigned int height, mir::examples::Context& eglcontext) :
+    window{create_window(connection, width, height, eglcontext.mir_surface()), &mir_window_release_sync}
 {
 }
 
@@ -64,51 +62,26 @@
 }
 
 MirWindow* me::NormalWindow::create_window(
-    MirConnection* connection,
-    unsigned int width,
-    unsigned int height,
-    bool prefers_alpha,
-    bool hardware)
+    MirConnection* connection, unsigned int width, unsigned int height, MirRenderSurface* surface)
 {
-    MirPixelFormat selected_format;
-    unsigned int valid_formats{0};
-    MirPixelFormat pixel_formats[mir_pixel_formats];
-    mir_connection_get_available_surface_formats(connection, pixel_formats, mir_pixel_formats, &valid_formats);
-    if (valid_formats == 0)
-        throw std::runtime_error("no pixel formats for surface");
-    selected_format = pixel_formats[0]; 
-    //select an 8 bit opaque format if we can
-    if (!prefers_alpha)
-    {
-        for(auto i = 0u; i < valid_formats; i++)
-        {
-            if (pixel_formats[i] == mir_pixel_format_xbgr_8888 ||
-                pixel_formats[i] == mir_pixel_format_xrgb_8888)
-            {
-                selected_format = pixel_formats[i];
-                break;
-            }
-        }
-    }
-    
-    auto deleter = [](MirWindowSpec *spec) { mir_window_spec_release(spec); };
-    std::unique_ptr<MirWindowSpec, decltype(deleter)> spec{
+    std::unique_ptr<MirWindowSpec, decltype(&mir_window_spec_release)> spec{
         mir_create_normal_window_spec(connection, width, height),
-        deleter
+        &mir_window_spec_release
     };
 
-    mir_window_spec_set_pixel_format(spec.get(), selected_format);
     mir_window_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
-    mir_window_spec_set_buffer_usage(spec.get(), hardware ? mir_buffer_usage_hardware : mir_buffer_usage_software);
+
+    if (surface)
+        mir_window_spec_add_render_surface(spec.get(), surface, width, height, 0, 0);
+
     auto window = mir_create_window_sync(spec.get());
     return window;
 }
 
-me::Context::Context(Connection& connection, MirWindow* window, int swap_interval) :
-    native_display(reinterpret_cast<EGLNativeDisplayType>(
-        mir_connection_get_egl_native_display(connection))),
-    native_window(reinterpret_cast<EGLNativeWindowType>(
-        mir_buffer_stream_get_egl_native_window(mir_window_get_buffer_stream(window)))),
+me::Context::Context(Connection& connection, int swap_interval, unsigned int width, unsigned int height) :
+    rsurface{mir_connection_create_render_surface_sync(connection, width, height), &mir_render_surface_release},
+    native_display(connection),
+    native_window(reinterpret_cast<EGLNativeWindowType>(rsurface.get())),
     display(native_display),
     config(chooseconfig(display.disp)),
     surface(display.disp, config, native_window),
@@ -117,7 +90,6 @@
     make_current();
     eglSwapInterval(display.disp, swap_interval);
 }
-#pragma GCC diagnostic pop
 
 void me::Context::make_current()
 {

=== modified file 'examples/client_helpers.h'
--- examples/client_helpers.h	2017-05-19 09:51:35 +0000
+++ examples/client_helpers.h	2017-05-23 10:53:07 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2015 Canonical Ltd.
+ * Copyright © 2015-2017 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
@@ -41,32 +41,18 @@
     MirConnection* connection;
 };
 
-class NormalWindow
-{
-public:
-    NormalWindow(Connection& connection, unsigned int width, unsigned int height, bool prefers_alpha = false, bool hardware = true);
-
-    operator MirWindow*() const;
-private:
-    MirWindow* create_window(MirConnection* connection, unsigned int width, unsigned int height, bool prefers_alpha, bool hardware);
-    std::function<void(MirWindow*)> const window_deleter{
-        [](MirWindow* window) { mir_window_release_sync(window); }
-    };
-    std::unique_ptr<MirWindow, decltype(window_deleter)> window;
-    NormalWindow(NormalWindow const&) = delete;
-    NormalWindow& operator=(NormalWindow const&) = delete;
-};
-
 class Context
 {
 public:
-    Context(Connection& connection, MirWindow* surface, int swap_interval);
+    Context(Connection& connection, int swap_interval, unsigned int width, unsigned int height);
     void make_current();
     void release_current();
     void swapbuffers();
+    MirRenderSurface* mir_surface() const { return rsurface.get(); }
     Context(Context const&) = delete;
     Context& operator=(Context const&) = delete;
 private:
+    std::unique_ptr<MirRenderSurface, decltype(&mir_render_surface_release)> rsurface;
     EGLConfig chooseconfig(EGLDisplay disp);
     EGLNativeDisplayType native_display;
     EGLNativeWindowType native_window;
@@ -94,6 +80,22 @@
     } context;
 };
 
+class NormalWindow
+{
+public:
+    NormalWindow(Connection& connection, unsigned int width, unsigned int height);
+    NormalWindow(Connection& connection, unsigned int width, unsigned int height, Context& eglcontext);
+
+    operator MirWindow*() const;
+private:
+    MirWindow* create_window(
+        MirConnection* connection, unsigned int width, unsigned int height, MirRenderSurface* surface);
+    std::unique_ptr<MirWindow, decltype(&mir_window_release_sync)> window;
+    NormalWindow(NormalWindow const&) = delete;
+    NormalWindow& operator=(NormalWindow const&) = delete;
+};
+
+
 struct Shader
 {
     Shader(GLchar const* const* src, GLuint type);

=== modified file 'examples/eglsquare.cpp'
--- examples/eglsquare.cpp	2017-05-08 03:04:26 +0000
+++ examples/eglsquare.cpp	2017-05-23 10:53:07 +0000
@@ -105,8 +105,8 @@
 public:
     SquareRenderingSurface(me::Connection& connection, int swap_interval) :
         dimensions(active_output_dimensions(connection)),
-        window{connection, dimensions.width, dimensions.height},
-        context{connection, window, swap_interval},
+        context{connection, swap_interval, dimensions.width, dimensions.height},
+        window{connection, dimensions.width, dimensions.height, context},
         program{context, dimensions.width, dimensions.height}
     {
         mir_window_set_event_handler(window, &on_event, this);
@@ -151,8 +151,8 @@
         unsigned int const height;
     } const dimensions;
 
+    me::Context context;
     me::NormalWindow window;
-    me::Context context;
     RenderProgram program;
 
     OutputDimensions active_output_dimensions(MirConnection* connection)

=== modified file 'examples/input_shapes.cpp'
--- examples/input_shapes.cpp	2017-05-08 03:04:26 +0000
+++ examples/input_shapes.cpp	2017-05-23 10:53:07 +0000
@@ -104,8 +104,8 @@
 {
 public:
     SurfaceWithAHole(me::Connection& connection) :
-        window{connection, width_and_height, width_and_height, true},
-        context{connection, window, 1},
+        context{connection, 1, width_and_height, width_and_height},
+        window{connection, width_and_height, width_and_height, context},
         program{context, width_and_height, width_and_height}
     {
         context.make_current();
@@ -122,8 +122,8 @@
     SurfaceWithAHole(SurfaceWithAHole const&) = delete;
     SurfaceWithAHole& operator=(SurfaceWithAHole const&) = delete;
 private:
+    me::Context context;
     me::NormalWindow window;
-    me::Context context;
     RenderProgram program;
 
     static int const width_and_height = 500;

=== modified file 'examples/multi_stream.cpp'
--- examples/multi_stream.cpp	2017-05-19 13:49:04 +0000
+++ examples/multi_stream.cpp	2017-05-23 10:53:07 +0000
@@ -241,8 +241,6 @@
 
     me::Connection connection{socket, "Multiple MirBufferStream example"};
 
-    me::NormalWindow window{connection, 200, 200, true, false};
-
     std::vector<MyBufferStream> stream;
 
     stream.emplace_back(connection, 200, 200, 0, 0);
@@ -280,6 +278,8 @@
         0
     };
 
+    me::NormalWindow window{connection, 200, 200};
+
     while (poll(&signal_poll, 1, 0) <= 0)
     {
         bounce_position(stream[1].displacement_x, bottom_dx, -100, 300);