diff mbox

[Branch,~glmark2-dev/glmark2/trunk] Rev 280: Fix for bug 1208996. Merged from lp:~jbkonno/+junk/glmark2/revision/279.

Message ID 20130807180923.30329.786.launchpad@ackee.canonical.com
State Accepted
Headers show

Commit Message

Jesse Barker Aug. 7, 2013, 6:09 p.m. UTC 
Merge authors:
  Joe Konno (jbkonno)
------------------------------------------------------------
revno: 280 [merge]
committer: Jesse Barker <jesse.barker@linaro.org>
branch nick: trunk
timestamp: Wed 2013-08-07 11:06:45 -0700
message:
  Fix for bug 1208996.  Merged from lp:~jbkonno/+junk/glmark2/revision/279.
  
  Add stub methods for new Wayland output events.
modified:
  src/native-state-wayland.cpp
  src/native-state-wayland.h


--
lp:glmark2
https://code.launchpad.net/~glmark2-dev/glmark2/trunk

You are subscribed to branch lp:glmark2.
To unsubscribe from this branch go to https://code.launchpad.net/~glmark2-dev/glmark2/trunk/+edit-subscription
diff mbox

Patch

=== modified file 'src/native-state-wayland.cpp'
--- src/native-state-wayland.cpp	2013-06-21 18:40:26 +0000
+++ src/native-state-wayland.cpp	2013-08-06 22:18:53 +0000
@@ -38,7 +38,9 @@ 
 
 const struct wl_output_listener NativeStateWayland::output_listener_ = {
     NativeStateWayland::output_handle_geometry,
-    NativeStateWayland::output_handle_mode
+    NativeStateWayland::output_handle_mode,
+    NativeStateWayland::output_handle_done,
+    NativeStateWayland::output_handle_scale
 };
 
 volatile bool NativeStateWayland::should_quit_ = false;
@@ -103,7 +105,7 @@ 
         my_output->output =
                 static_cast<struct wl_output *>(
                     wl_registry_bind(registry,
-                                     id, &wl_output_interface, 1));
+                                     id, &wl_output_interface, 2));
         that->display_->outputs.push_back(my_output);
 
         wl_output_add_listener(my_output->output, &output_listener_, my_output);
@@ -143,6 +145,17 @@ 
 }
 
 void
+NativeStateWayland::output_handle_done(void * /*data*/, struct wl_output * /*wl_output*/)
+{
+}
+
+void
+NativeStateWayland::output_handle_scale(void * /*data*/, struct wl_output * /*wl_output*/,
+                                        int32_t /*factor*/)
+{
+}
+
+void
 NativeStateWayland::shell_surface_handle_ping(void * /*data*/, struct wl_shell_surface *shell_surface,
                                               uint32_t serial)
 {

=== modified file 'src/native-state-wayland.h'
--- src/native-state-wayland.h	2013-04-08 18:58:52 +0000
+++ src/native-state-wayland.h	2013-08-06 22:18:53 +0000
@@ -70,6 +70,12 @@ 
              int32_t width, int32_t height, int32_t refresh);
 
     static void
+    output_handle_done(void *data, struct wl_output *wl_output);
+
+    static void
+    output_handle_scale(void *data, struct wl_output *wl_output, int32_t factor);
+
+    static void
     shell_surface_handle_ping(void *data, struct wl_shell_surface *shell_surface,
                               uint32_t serial);
     static void