mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2026-04-25 06:46:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add support for linux-explicit-synchronization-unstable-v1

Browse source
This commit is contained in:
Simon Ser 2020-03-15 15:20:39 +01:00
parent eeb90a7963
commit 5083b1b386
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
4 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/sway/output.h
View file

@ -57,6 +57,8 @@ struct sway_output {
uint32_t refresh_nsec; uint32_t refresh_nsec;
int max_render_time; // In milliseconds int max_render_time; // In milliseconds
struct wl_event_source *repaint_timer; struct wl_event_source *repaint_timer;
list_t *textured_buffers;
}; };
struct sway_output *output_create(struct wlr_output *wlr_output); struct sway_output *output_create(struct wlr_output *wlr_output);

20
sway/desktop/render.c
View file

@ -140,12 +140,18 @@ static void render_surface_iterator(struct sway_output *output, struct sway_view
struct wlr_output *wlr_output = output->wlr_output; struct wlr_output *wlr_output = output->wlr_output;
pixman_region32_t *output_damage = data->damage; pixman_region32_t *output_damage = data->damage;
float alpha = data->alpha; float alpha = data->alpha;
struct wlr_renderer *renderer =
wlr_backend_get_renderer(wlr_output->backend);
struct wlr_texture *texture = wlr_surface_get_texture(surface); struct wlr_texture *texture = wlr_surface_get_texture(surface);
if (!texture) { if (!texture) {
return; return;
} }
if (surface->buffer->base.in_fence_fd >= 0) {
wlr_renderer_wait_in_fence(renderer, surface->buffer->base.in_fence_fd);
}
struct wlr_fbox src_box; struct wlr_fbox src_box;
wlr_surface_get_buffer_source_box(surface, &src_box); wlr_surface_get_buffer_source_box(surface, &src_box);
@ -163,6 +169,8 @@ static void render_surface_iterator(struct sway_output *output, struct sway_view
wlr_presentation_surface_sampled_on_output(server.presentation, surface, wlr_presentation_surface_sampled_on_output(server.presentation, surface,
wlr_output); wlr_output);
list_add(output->textured_buffers, &surface->buffer->base);
} }
static void render_layer_toplevel(struct sway_output *output, static void render_layer_toplevel(struct sway_output *output,
@ -1008,6 +1016,7 @@ void output_render(struct sway_output *output, struct timespec *when,
} }
wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height); wlr_renderer_begin(renderer, wlr_output->width, wlr_output->height);
output->textured_buffers->length = 0;
if (!pixman_region32_not_empty(damage)) { if (!pixman_region32_not_empty(damage)) {
// Output isn't damaged but needs buffer swap // Output isn't damaged but needs buffer swap
@ -1109,6 +1118,17 @@ renderer_end:
wlr_output_render_software_cursors(wlr_output, damage); wlr_output_render_software_cursors(wlr_output, damage);
wlr_renderer_end(renderer); wlr_renderer_end(renderer);
// TODO: software cursors
int fence_fd = wlr_renderer_dup_out_fence(renderer);
if (fence_fd >= 0) {
for (int i = 0; i < output->textured_buffers->length; i++) {
struct wlr_buffer *buffer = output->textured_buffers->items[i];
wlr_buffer_add_out_fence(buffer, fence_fd);
}
close(fence_fd);
}
output->textured_buffers->length = 0;
int width, height; int width, height;
wlr_output_transformed_resolution(wlr_output, &width, &height); wlr_output_transformed_resolution(wlr_output, &width, &height);

2
sway/server.c
View file

@ -16,6 +16,7 @@
#include <wlr/types/wlr_gtk_primary_selection.h> #include <wlr/types/wlr_gtk_primary_selection.h>
#include <wlr/types/wlr_idle.h> #include <wlr/types/wlr_idle.h>
#include <wlr/types/wlr_layer_shell_v1.h> #include <wlr/types/wlr_layer_shell_v1.h>
#include <wlr/types/wlr_linux_explicit_synchronization_v1.h>
#include <wlr/types/wlr_pointer_constraints_v1.h> #include <wlr/types/wlr_pointer_constraints_v1.h>
#include <wlr/types/wlr_primary_selection_v1.h> #include <wlr/types/wlr_primary_selection_v1.h>
#include <wlr/types/wlr_relative_pointer_v1.h> #include <wlr/types/wlr_relative_pointer_v1.h>
@ -148,6 +149,7 @@ bool server_init(struct sway_server *server) {
wlr_data_control_manager_v1_create(server->wl_display); wlr_data_control_manager_v1_create(server->wl_display);
wlr_primary_selection_v1_device_manager_create(server->wl_display); wlr_primary_selection_v1_device_manager_create(server->wl_display);
wlr_viewporter_create(server->wl_display); wlr_viewporter_create(server->wl_display);
wlr_linux_explicit_synchronization_v1_create(server->wl_display);
server->socket = wl_display_add_socket_auto(server->wl_display); server->socket = wl_display_add_socket_auto(server->wl_display);
if (!server->socket) { if (!server->socket) {

3
sway/tree/output.c
View file

@ -107,6 +107,8 @@ struct sway_output *output_create(struct wlr_output *wlr_output) {
wl_list_init(&output->layers[i]); wl_list_init(&output->layers[i]);
} }
output->textured_buffers = create_list();
return output; return output;
} }
@ -235,6 +237,7 @@ void output_destroy(struct sway_output *output) {
} }
list_free(output->workspaces); list_free(output->workspaces);
list_free(output->current.workspaces); list_free(output->current.workspaces);
list_free(output->textured_buffers);
wl_event_source_remove(output->repaint_timer); wl_event_source_remove(output->repaint_timer);
free(output); free(output);
} }