commit ecada7f
Michael Forney
·
2013-10-25 00:48:15 +0000 UTC
parent de8676f
output: Support protocol version 2
1 files changed,
+6,
-3
+6,
-3
1@@ -16,8 +16,8 @@ static void bind_output(struct wl_client * client, void * data,
2 struct wl_resource * resource;
3 uint32_t flags;
4
5- if (version >= 1)
6- version = 1;
7+ if (version >= 2)
8+ version = 2;
9
10 resource = wl_resource_create(client, &wl_output_interface, version, id);
11 wl_resource_set_implementation(resource, NULL, output,
12@@ -39,6 +39,9 @@ static void bind_output(struct wl_client * client, void * data,
13 wl_output_send_mode(resource, flags, mode->width, mode->height,
14 mode->refresh);
15 }
16+
17+ if (version >= 2)
18+ wl_output_send_done(resource);
19 }
20
21 bool swc_output_initialize(struct swc_output * output, struct swc_drm * drm,
22@@ -122,6 +125,6 @@ void swc_output_finish(struct swc_output * output)
23 void swc_output_add_globals(struct swc_output * output,
24 struct wl_display * display)
25 {
26- wl_global_create(display, &wl_output_interface, 1, output, &bind_output);
27+ wl_global_create(display, &wl_output_interface, 2, output, &bind_output);
28 }
29