Merge lp:~afrantzis/glmark2/update-mir into lp:glmark2/2011.11

[Alexandros Frantzis]

NativeStateMir: Update for newest Mir client API

NativeStateMir: Update for newest Mir client API

[Jesse Barker (jesse-barker)]

As long as you're happy with the first surface format that isn't 888[8] when you can't find an 888[8] format (I can't speak to ordering of such things for Mir), it looks fine to me.

cheers,
Jesse

review: Approve

=== modified file 'src/native-state-mir.cpp'
--- src/native-state-mir.cpp	2013-03-05 17:37:01 +0000
+++ src/native-state-mir.cpp	2013-10-18 15:04:27 +0000
@@ -29,25 +29,89 @@
 namespace
 {
 
-void
-connected_callback(MirConnection *connection, void *client_context)
-{
-    MirConnection **con = static_cast<MirConnection**>(client_context);
-    *con = connection;
-}
-
-void
-surface_created_callback(MirSurface *surface, void *client_context)
-{
-    MirSurface **surf = static_cast<MirSurface**>(client_context);
-    *surf = surface;
-}
-
-void
-null_surface_callback(MirSurface * /*obj*/, void * /*client_context*/)
-{
-}
-
+const MirDisplayOutput*
+find_active_output(const MirDisplayConfiguration* conf)
+{
+    const MirDisplayOutput *output = NULL;
+
+    for (uint32_t d = 0; d < conf->num_outputs; d++)
+    {
+        const MirDisplayOutput* out = &conf->outputs[d];
+
+        if (out->used && out->connected &&
+            out->num_modes && out->current_mode < out->num_modes)
+        {
+            output = out;
+            break;
+        }
+    }
+
+    return output;
+}
+
+MirPixelFormat
+find_best_surface_format(MirConnection* connection)
+{
+    static const unsigned int formats_size = 10;
+    MirPixelFormat formats[formats_size];
+    unsigned int num_valid_formats = 0;
+    MirPixelFormat best_format = mir_pixel_format_invalid;
+
+    mir_connection_get_available_surface_formats(connection,
+                                                 formats,
+                                                 formats_size,
+                                                 &num_valid_formats);
+
+    /*
+     * Surface formats come sorted in largest active bits order.
+     * Prefer opaque formats over formats with alpha, and largest
+     * formats over smaller ones.
+     */
+    for (unsigned int i = 0; i < num_valid_formats; i++)
+    {
+        if (formats[i] == mir_pixel_format_xbgr_8888 ||
+            formats[i] == mir_pixel_format_xrgb_8888 ||
+            formats[i] == mir_pixel_format_bgr_888)
+        {
+            best_format = formats[i];
+            break;
+        }
+        else if (best_format == mir_pixel_format_invalid)
+        {
+            best_format = formats[i];
+        }
+    }
+
+    return best_format;
+}
+
+class DisplayConfiguration
+{
+public:
+    DisplayConfiguration(MirConnection* connection)
+        : display_config(mir_connection_create_display_config(connection))
+    {
+    }
+
+    ~DisplayConfiguration()
+    {
+        if (display_config)
+            mir_display_config_destroy(display_config);
+    }
+
+    bool is_valid()
+    {
+        return display_config != 0;
+    }
+
+    operator MirDisplayConfiguration*() const
+    {
+        return display_config;
+    }
+
+private:
+    MirDisplayConfiguration* display_config;
+};
 }
 
 volatile sig_atomic_t NativeStateMir::should_quit_(false);
@@ -55,8 +119,8 @@
 NativeStateMir::~NativeStateMir()
 {
     if (mir_surface_)
-        mir_wait_for(mir_surface_release(mir_surface_, null_surface_callback, 0));
-    if (mir_connection_is_valid(mir_connection_))
+        mir_surface_release_sync(mir_surface_);
+    if (mir_connection_)
         mir_connection_release(mir_connection_);
 }
 
@@ -71,11 +135,10 @@
     sigaction(SIGINT, &sa, NULL);
     sigaction(SIGTERM, &sa, NULL);
 
-    mir_wait_for(mir_connect("/tmp/mir_socket", "glmark2",
-                             connected_callback, &mir_connection_));
+    mir_connection_ = mir_connect_sync(NULL, "glmark2");
 
     if (!mir_connection_is_valid(mir_connection_)) {
-        Log::error("Failed to connect to mir\n");
+        Log::error("Couldn't connect to the Mir display server\n");
         return false;
     }
 
@@ -97,7 +160,8 @@
     static const char *win_name("glmark2 "GLMARK_VERSION);
 
     if (!mir_connection_is_valid(mir_connection_)) {
-        Log::error("No connection to mir!\n");
+        Log::error("Cannot create a Mir surface without a valid connection "
+                   "to the Mir display server!\n");
         return false;
     }
 
@@ -108,7 +172,7 @@
              (properties_.width != properties.width ||
               properties_.height != properties.height)))
         {
-            mir_wait_for(mir_surface_release(mir_surface_, null_surface_callback, 0));
+            mir_surface_release_sync(mir_surface_);
             mir_surface_ = 0;
         }
         else
@@ -117,28 +181,55 @@
         }
     }
 
-    MirDisplayInfo display_info;
-    mir_connection_get_display_info(mir_connection_, &display_info);
+    uint32_t output_id = mir_display_output_id_invalid;
 
     properties_ = properties;
 
     if (properties_.fullscreen) {
-        properties_.width = display_info.width;
-        properties_.height = display_info.height;
-    }
+        DisplayConfiguration display_config(mir_connection_);
+        if (!display_config.is_valid()) {
+            Log::error("Couldn't get display configuration from the Mir display server!\n");
+            return false;
+        }
+
+        const MirDisplayOutput* active_output = find_active_output(display_config);
+        if (active_output == NULL) {
+            Log::error("Couldn't find an active output in the Mir display server!\n");
+            return false;
+        }
+
+        const MirDisplayMode* current_mode =
+            &active_output->modes[active_output->current_mode];
+
+        properties_.width = current_mode->horizontal_resolution;
+        properties_.height = current_mode->vertical_resolution;
+        output_id = active_output->output_id;
+
+        Log::debug("Making Mir surface fullscreen on output %u (%ux%u)\n",
+                   output_id, properties_.width, properties_.height);
+    }
+
+    MirPixelFormat surface_format = find_best_surface_format(mir_connection_);
+    if (surface_format == mir_pixel_format_invalid) {
+        Log::error("Couldn't find a pixel format to use for the Mir surface!\n");
+        return false;
+    }
+
+    Log::debug("Using pixel format %u for the Mir surface\n", surface_format);
 
     MirSurfaceParameters surface_parameters = {
         win_name,
         properties_.width, properties_.height,
-        display_info.supported_pixel_format[0],
-        mir_buffer_usage_hardware
+        surface_format,
+        mir_buffer_usage_hardware,
+        output_id
     };
 
-    mir_wait_for(mir_surface_create(mir_connection_, &surface_parameters,
-                                    surface_created_callback, &mir_surface_));
+    mir_surface_ = mir_connection_create_surface_sync(mir_connection_,
+                                                      &surface_parameters);
 
-    if (!mir_surface_) {
-        Log::error("Failed to create mir surface!\n");
+    if (!mir_surface_ || !mir_surface_is_valid(mir_surface_)) {
+        Log::error("Failed to create Mir surface!\n");
         return false;
     }
 

=== modified file 'src/native-state-mir.h'
--- src/native-state-mir.h	2013-03-05 17:04:09 +0000
+++ src/native-state-mir.h	2013-10-18 15:04:27 +0000
@@ -23,7 +23,7 @@
 #define GLMARK2_NATIVE_STATE_MIR_H_
 
 #include "native-state.h"
-#include <mir_client_library.h>
+#include <mir_toolkit/mir_client_library.h>
 #include <csignal>
 
 class NativeStateMir : public NativeState