blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

output: add generic wlr_output_export_dmabuf implementation 

When wlr_output manages its own swap-chain, there's no need to
hook into the backend to grab DMA-BUFs. Instead, maintain a
wlr_output.front_buffer field with the latest committed buffer.
This commit is contained in:
Simon Ser 2021-06-08 09:39:24 +02:00 committed by Simon Zeni
parent 28aa803916
commit 87e8c60faf
2 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wlr/types/wlr_output.h
View File

@ -186,7 +186,7 @@ struct wlr_output {
int software_cursor_locks; // number of locks forcing software cursors int software_cursor_locks; // number of locks forcing software cursors
struct wlr_swapchain *swapchain; struct wlr_swapchain *swapchain;
struct wlr_buffer *back_buffer; struct wlr_buffer *back_buffer, *front_buffer;
struct wl_listener display_destroy; struct wl_listener display_destroy;

28
types/wlr_output.c
View File

@ -390,6 +390,9 @@ void wlr_output_destroy(struct wlr_output *output) {
return; return;
} }
wlr_buffer_unlock(output->front_buffer);
output->front_buffer = NULL;
wl_list_remove(&output->display_destroy.link); wl_list_remove(&output->display_destroy.link);
wlr_output_destroy_global(output); wlr_output_destroy_global(output);
output_clear_back_buffer(output); output_clear_back_buffer(output);
@ -790,6 +793,15 @@ bool wlr_output_commit(struct wlr_output *output) {
wlr_output_schedule_done(output); wlr_output_schedule_done(output);
} }
// Unset the front-buffer when a new buffer will replace it or when the
// output is getting disabled
if ((output->pending.committed & WLR_OUTPUT_STATE_BUFFER) ||
((output->pending.committed & WLR_OUTPUT_STATE_ENABLED) &&
!output->pending.enabled)) {
wlr_buffer_unlock(output->front_buffer);
output->front_buffer = NULL;
}
if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
output->frame_pending = true; output->frame_pending = true;
output->needs_frame = false; output->needs_frame = false;
@ -797,7 +809,8 @@ bool wlr_output_commit(struct wlr_output *output) {
if (back_buffer != NULL) { if (back_buffer != NULL) {
wlr_swapchain_set_buffer_submitted(output->swapchain, back_buffer); wlr_swapchain_set_buffer_submitted(output->swapchain, back_buffer);
wlr_buffer_unlock(back_buffer); wlr_buffer_unlock(output->front_buffer);
output->front_buffer = back_buffer;
} }
uint32_t committed = output->pending.committed; uint32_t committed = output->pending.committed;
@ -913,10 +926,19 @@ size_t wlr_output_get_gamma_size(struct wlr_output *output) {
bool wlr_output_export_dmabuf(struct wlr_output *output, bool wlr_output_export_dmabuf(struct wlr_output *output,
struct wlr_dmabuf_attributes *attribs) { struct wlr_dmabuf_attributes *attribs) {
if (!output->impl->export_dmabuf) { if (output->impl->export_dmabuf) {
return output->impl->export_dmabuf(output, attribs);
}
if (output->front_buffer == NULL) {
return false; return false;
} }
return output->impl->export_dmabuf(output, attribs);
struct wlr_dmabuf_attributes buf_attribs = {0};
if (!wlr_buffer_get_dmabuf(output->front_buffer, &buf_attribs)) {
return false;
}
return wlr_dmabuf_attributes_copy(attribs, &buf_attribs);
} }
void wlr_output_update_needs_frame(struct wlr_output *output) { void wlr_output_update_needs_frame(struct wlr_output *output) {