mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

examples/explicit-sync: support linux-explicit-synchronization-v2

Browse source
This commit is contained in:
Simon Ser 2021-10-21 15:23:38 +02:00
parent 43df0bd565
commit d5755bdd49
1 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

55
examples/explicit-sync.c
View file

@ -12,6 +12,7 @@
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_compositor.h>
#include <wlr/types/wlr_linux_explicit_synchronization_v1.h> #include <wlr/types/wlr_linux_explicit_synchronization_v1.h>
#include <wlr/types/wlr_linux_explicit_synchronization_v2.h>
#include <wlr/types/wlr_output.h> #include <wlr/types/wlr_output.h>
#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_surface.h>
#include <wlr/types/wlr_xdg_shell.h> #include <wlr/types/wlr_xdg_shell.h>
@ -27,6 +28,7 @@ struct server {
struct wlr_backend *backend; struct wlr_backend *backend;
struct wlr_renderer *renderer; struct wlr_renderer *renderer;
struct wlr_linux_explicit_synchronization_v1 *explicit_sync_v1; struct wlr_linux_explicit_synchronization_v1 *explicit_sync_v1;
struct wlr_linux_explicit_sync_v2 *explicit_sync_v2;
struct wl_list outputs; struct wl_list outputs;
struct wl_list surfaces; struct wl_list surfaces;
@ -78,17 +80,33 @@ static void output_handle_frame(struct wl_listener *listener, void *data) {
continue; continue;
} }
uint64_t surface_point = surface->wlr->current.seq; struct wlr_linux_surface_sync_v2_state *sync_v2_state =
if (!wlr_linux_explicit_synchronization_v1_signal_surface_timeline( wlr_linux_explicit_sync_v2_get_surface_state(
output->server->explicit_sync_v1, surface->wlr, output->server->explicit_sync_v2, surface->wlr);
surface->timeline, surface_point)) { if (sync_v2_state != NULL) {
wlr_log(WLR_ERROR, "Failed to signal surface timeline"); if (sync_v2_state->acquire_timeline == NULL) {
continue; wlr_log(WLR_ERROR, "Missing acquire sync point");
} continue;
if (!wlr_renderer_wait_timeline(renderer, }
surface->timeline, surface_point)) { if (!wlr_renderer_wait_timeline(renderer,
wlr_log(WLR_ERROR, "Failed to wait for surface timeline"); sync_v2_state->acquire_timeline,
continue; sync_v2_state->acquire_point)) {
wlr_log(WLR_ERROR, "Failed to wait for surface timeline");
continue;
}
} else {
uint64_t surface_point = surface->wlr->current.seq;
if (!wlr_linux_explicit_synchronization_v1_signal_surface_timeline(
output->server->explicit_sync_v1, surface->wlr,
surface->timeline, surface_point)) {
wlr_log(WLR_ERROR, "Failed to signal surface timeline");
continue;
}
if (!wlr_renderer_wait_timeline(renderer,
surface->timeline, surface_point)) {
wlr_log(WLR_ERROR, "Failed to wait for surface timeline");
continue;
}
} }
wlr_render_texture(renderer, texture, output->wlr->transform_matrix, wlr_render_texture(renderer, texture, output->wlr->transform_matrix,
@ -117,6 +135,17 @@ static void output_handle_frame(struct wl_listener *listener, void *data) {
} }
wl_list_for_each(surface, &output->server->surfaces, link) { wl_list_for_each(surface, &output->server->surfaces, link) {
struct wlr_linux_surface_sync_v2_state *sync_v2_state =
wlr_linux_explicit_sync_v2_get_surface_state(
output->server->explicit_sync_v2, surface->wlr);
if (sync_v2_state != NULL && sync_v2_state->release_timeline != NULL) {
if (!wlr_render_timeline_transfer(sync_v2_state->release_timeline,
sync_v2_state->release_point, output->out_timeline,
output_point)) {
wlr_log(WLR_ERROR, "Failed to transfer surface release timeline");
}
}
if (!wlr_linux_explicit_synchronization_v1_wait_surface_timeline( if (!wlr_linux_explicit_synchronization_v1_wait_surface_timeline(
output->server->explicit_sync_v1, surface->wlr, output->server->explicit_sync_v1, surface->wlr,
output->out_timeline, output_point)) { output->out_timeline, output_point)) {
@ -217,6 +246,10 @@ int main(int argc, char *argv[]) {
server.explicit_sync_v1 = server.explicit_sync_v1 =
wlr_linux_explicit_synchronization_v1_create(server.display); wlr_linux_explicit_synchronization_v1_create(server.display);
int drm_fd = wlr_renderer_get_drm_fd(server.renderer);
server.explicit_sync_v2 =
wlr_linux_explicit_sync_v2_create(server.display, drm_fd);
wl_list_init(&server.outputs); wl_list_init(&server.outputs);
wl_list_init(&server.surfaces); wl_list_init(&server.surfaces);