protocol: migrate to stable presentation-time.xml
Remove the unstable presentation_timing.xml file, and use
presentation-time.xml from wayland-protocols instead to generate all the
Presentation extension bindings.
The following renames are done according to the XML changes:
- generated header includes
- enum constants and macros prefixed with WP_
- interface symbol names prefixed with wp_
- protocol API calls prefixed with wp_
Clients use wp_presentation_interface.name rather than hardcoding the
global interface name: presentation-shm, weston-info, presentation-test.
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Jonas Ådahl <jadahl@gmail.com>
[Pekka: updated wayland-protocols dependency to 1.2]
diff --git a/src/compositor.c b/src/compositor.c
index 98efb4c..3e3fc8c 100644
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -55,7 +55,7 @@
#include "compositor.h"
#include "scaler-server-protocol.h"
-#include "presentation_timing-server-protocol.h"
+#include "presentation-time-server-protocol.h"
#include "shared/helpers.h"
#include "shared/os-compatibility.h"
#include "shared/timespec-util.h"
@@ -443,7 +443,7 @@
weston_presentation_feedback_discard(
struct weston_presentation_feedback *feedback)
{
- presentation_feedback_send_discarded(feedback->resource);
+ wp_presentation_feedback_send_discarded(feedback->resource);
wl_resource_destroy(feedback->resource);
}
@@ -473,16 +473,16 @@
if (wl_resource_get_client(o) != client)
continue;
- presentation_feedback_send_sync_output(feedback->resource, o);
+ wp_presentation_feedback_send_sync_output(feedback->resource, o);
}
secs = ts->tv_sec;
- presentation_feedback_send_presented(feedback->resource,
- secs >> 32, secs & 0xffffffff,
- ts->tv_nsec,
- refresh_nsec,
- seq >> 32, seq & 0xffffffff,
- flags | feedback->psf_flags);
+ wp_presentation_feedback_send_presented(feedback->resource,
+ secs >> 32, secs & 0xffffffff,
+ ts->tv_nsec,
+ refresh_nsec,
+ seq >> 32, seq & 0xffffffff,
+ flags | feedback->psf_flags);
wl_resource_destroy(feedback->resource);
}
@@ -496,7 +496,7 @@
{
struct weston_presentation_feedback *feedback, *tmp;
- assert(!(flags & PRESENTATION_FEEDBACK_INVALID) ||
+ assert(!(flags & WP_PRESENTATION_FEEDBACK_INVALID) ||
wl_list_empty(list));
wl_list_for_each_safe(feedback, tmp, list, link)
@@ -2489,7 +2489,7 @@
* the deadline given by repaint_msec? In that case we delay until
* the deadline of the next frame, to give clients a more predictable
* timing of the repaint cycle to lock on. */
- if (presented_flags == PRESENTATION_FEEDBACK_INVALID && msec < 0)
+ if (presented_flags == WP_PRESENTATION_FEEDBACK_INVALID && msec < 0)
msec += refresh_nsec / 1000000;
if (msec < 1)
@@ -4605,7 +4605,7 @@
goto err_calloc;
feedback->resource = wl_resource_create(client,
- &presentation_feedback_interface,
+ &wp_presentation_feedback_interface,
1, callback);
if (!feedback->resource)
goto err_create;
@@ -4624,7 +4624,7 @@
wl_client_post_no_memory(client);
}
-static const struct presentation_interface presentation_implementation = {
+static const struct wp_presentation_interface presentation_implementation = {
presentation_destroy,
presentation_feedback
};
@@ -4636,7 +4636,7 @@
struct weston_compositor *compositor = data;
struct wl_resource *resource;
- resource = wl_resource_create(client, &presentation_interface,
+ resource = wl_resource_create(client, &wp_presentation_interface,
version, id);
if (resource == NULL) {
wl_client_post_no_memory(client);
@@ -4645,7 +4645,7 @@
wl_resource_set_implementation(resource, &presentation_implementation,
compositor, NULL);
- presentation_send_clock_id(resource, compositor->presentation_clock);
+ wp_presentation_send_clock_id(resource, compositor->presentation_clock);
}
static void
@@ -4754,7 +4754,7 @@
ec, bind_scaler))
goto fail;
- if (!wl_global_create(ec->wl_display, &presentation_interface, 1,
+ if (!wl_global_create(ec->wl_display, &wp_presentation_interface, 1,
ec, bind_presentation))
goto fail;