hyprwm
/
wlroots-hyprland
mirror of https://github.com/hyprwm/wlroots-hyprland.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

output: pass wlr_output_state to rendering functions 

No functional change.
This commit is contained in:
Simon Ser 2022-05-24 19:43:56 +02:00
parent 927661d246
commit 9e25d3074d
3 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/types/wlr_output.h
View File

@ -6,10 +6,13 @@
void output_pending_resolution(struct wlr_output *output, void output_pending_resolution(struct wlr_output *output,
const struct wlr_output_state *state, int *width, int *height); const struct wlr_output_state *state, int *width, int *height);
void output_state_attach_buffer(struct wlr_output_state *state,
struct wlr_buffer *buffer);
struct wlr_drm_format *output_pick_format(struct wlr_output *output, struct wlr_drm_format *output_pick_format(struct wlr_output *output,
const struct wlr_drm_format_set *display_formats, uint32_t format); const struct wlr_drm_format_set *display_formats, uint32_t format);
void output_clear_back_buffer(struct wlr_output *output); void output_clear_back_buffer(struct wlr_output *output);
bool output_ensure_buffer(struct wlr_output *output); bool output_ensure_buffer(struct wlr_output *output,
struct wlr_output_state *state);
#endif #endif

15
types/output/output.c
View File

@ -660,7 +660,7 @@ bool wlr_output_test(struct wlr_output *output) {
if (!output_basic_test(output)) { if (!output_basic_test(output)) {
return false; return false;
} }
if (!output_ensure_buffer(output)) { if (!output_ensure_buffer(output, &output->pending)) {
return false; return false;
} }
if (!output->impl->test) { if (!output->impl->test) {
@ -681,7 +681,7 @@ bool wlr_output_commit(struct wlr_output *output) {
return false; return false;
} }
if (!output_ensure_buffer(output)) { if (!output_ensure_buffer(output, &output->pending)) {
return false; return false;
} }
@ -804,11 +804,16 @@ void wlr_output_rollback(struct wlr_output *output) {
output_state_clear(&output->pending); output_state_clear(&output->pending);
} }
void output_state_attach_buffer(struct wlr_output_state *state,
struct wlr_buffer *buffer) {
output_state_clear_buffer(state);
state->committed |= WLR_OUTPUT_STATE_BUFFER;
state->buffer = wlr_buffer_lock(buffer);
}
void wlr_output_attach_buffer(struct wlr_output *output, void wlr_output_attach_buffer(struct wlr_output *output,
struct wlr_buffer *buffer) { struct wlr_buffer *buffer) {
output_state_clear_buffer(&output->pending); output_state_attach_buffer(&output->pending, buffer);
output->pending.committed |= WLR_OUTPUT_STATE_BUFFER;
output->pending.buffer = wlr_buffer_lock(buffer);
} }
void wlr_output_send_frame(struct wlr_output *output) { void wlr_output_send_frame(struct wlr_output *output) {

59
types/output/render.c
View File

@ -44,9 +44,9 @@ bool wlr_output_init_render(struct wlr_output *output,
* If set to false, the swapchain's format is guaranteed to not use modifiers. * If set to false, the swapchain's format is guaranteed to not use modifiers.
*/ */
static bool output_create_swapchain(struct wlr_output *output, static bool output_create_swapchain(struct wlr_output *output,
bool allow_modifiers) { const struct wlr_output_state *state, bool allow_modifiers) {
int width, height; int width, height;
output_pending_resolution(output, &output->pending, &width, &height); output_pending_resolution(output, state, &width, &height);
struct wlr_allocator *allocator = output->allocator; struct wlr_allocator *allocator = output->allocator;
assert(allocator != NULL); assert(allocator != NULL);
@ -99,10 +99,10 @@ static bool output_create_swapchain(struct wlr_output *output,
} }
static bool output_attach_back_buffer(struct wlr_output *output, static bool output_attach_back_buffer(struct wlr_output *output,
int *buffer_age) { struct wlr_output_state *state, int *buffer_age) {
assert(output->back_buffer == NULL); assert(output->back_buffer == NULL);
if (!output_create_swapchain(output, true)) { if (!output_create_swapchain(output, state, true)) {
return false; return false;
} }
@ -138,23 +138,29 @@ void output_clear_back_buffer(struct wlr_output *output) {
output->back_buffer = NULL; output->back_buffer = NULL;
} }
bool wlr_output_attach_render(struct wlr_output *output, int *buffer_age) { static bool output_attach_render(struct wlr_output *output,
if (!output_attach_back_buffer(output, buffer_age)) { struct wlr_output_state *state, int *buffer_age) {
if (!output_attach_back_buffer(output, state, buffer_age)) {
return false; return false;
} }
wlr_output_attach_buffer(output, output->back_buffer); output_state_attach_buffer(state, output->back_buffer);
return true; return true;
} }
static bool output_attach_empty_buffer(struct wlr_output *output) { bool wlr_output_attach_render(struct wlr_output *output, int *buffer_age) {
assert(!(output->pending.committed & WLR_OUTPUT_STATE_BUFFER)); return output_attach_render(output, &output->pending, buffer_age);
}
if (!wlr_output_attach_render(output, NULL)) { static bool output_attach_empty_buffer(struct wlr_output *output,
struct wlr_output_state *state) {
assert(!(state->committed & WLR_OUTPUT_STATE_BUFFER));
if (!output_attach_render(output, state, NULL)) {
return false; return false;
} }
int width, height; int width, height;
output_pending_resolution(output, &output->pending, &width, &height); output_pending_resolution(output, state, &width, &height);
struct wlr_renderer *renderer = output->renderer; struct wlr_renderer *renderer = output->renderer;
wlr_renderer_begin(renderer, width, height); wlr_renderer_begin(renderer, width, height);
@ -164,42 +170,41 @@ static bool output_attach_empty_buffer(struct wlr_output *output) {
return true; return true;
} }
bool output_ensure_buffer(struct wlr_output *output) { bool output_ensure_buffer(struct wlr_output *output,
struct wlr_output_state *state) {
// If we're lighting up an output or changing its mode, make sure to // If we're lighting up an output or changing its mode, make sure to
// provide a new buffer // provide a new buffer
bool needs_new_buffer = false; bool needs_new_buffer = false;
if ((output->pending.committed & WLR_OUTPUT_STATE_ENABLED) && if ((state->committed & WLR_OUTPUT_STATE_ENABLED) && state->enabled) {
output->pending.enabled) {
needs_new_buffer = true; needs_new_buffer = true;
} }
if (output->pending.committed & WLR_OUTPUT_STATE_MODE) { if (state->committed & WLR_OUTPUT_STATE_MODE) {
needs_new_buffer = true; needs_new_buffer = true;
} }
if (output->pending.committed & WLR_OUTPUT_STATE_RENDER_FORMAT) { if (state->committed & WLR_OUTPUT_STATE_RENDER_FORMAT) {
needs_new_buffer = true; needs_new_buffer = true;
} }
if (!needs_new_buffer || if (!needs_new_buffer || (state->committed & WLR_OUTPUT_STATE_BUFFER)) {
(output->pending.committed & WLR_OUTPUT_STATE_BUFFER)) {
return true; return true;
} }
// If the backend doesn't necessarily need a new buffer on modeset, don't // If the backend doesn't necessarily need a new buffer on modeset, don't
// bother allocating one. // bother allocating one.
if (!output->impl->test || output->impl->test(output, &output->pending)) { if (!output->impl->test || output->impl->test(output, state)) {
return true; return true;
} }
wlr_log(WLR_DEBUG, "Attaching empty buffer to output for modeset"); wlr_log(WLR_DEBUG, "Attaching empty buffer to output for modeset");
if (!output_attach_empty_buffer(output)) { if (!output_attach_empty_buffer(output, state)) {
goto error; goto error;
} }
if (!output->impl->test || output->impl->test(output, &output->pending)) { if (!output->impl->test || output->impl->test(output, state)) {
return true; return true;
} }
output_clear_back_buffer(output); output_clear_back_buffer(output);
output->pending.committed &= ~WLR_OUTPUT_STATE_BUFFER; state->committed &= ~WLR_OUTPUT_STATE_BUFFER;
if (output->swapchain->format->len == 0) { if (output->swapchain->format->len == 0) {
return false; return false;
@ -209,20 +214,20 @@ bool output_ensure_buffer(struct wlr_output *output) {
// modifiers to see if that makes a difference. // modifiers to see if that makes a difference.
wlr_log(WLR_DEBUG, "Output modeset test failed, retrying without modifiers"); wlr_log(WLR_DEBUG, "Output modeset test failed, retrying without modifiers");
if (!output_create_swapchain(output, false)) { if (!output_create_swapchain(output, state, false)) {
return false; return false;
} }
if (!output_attach_empty_buffer(output)) { if (!output_attach_empty_buffer(output, state)) {
goto error; goto error;
} }
if (!output->impl->test(output, &output->pending)) { if (!output->impl->test(output, state)) {
goto error; goto error;
} }
return true; return true;
error: error:
output_clear_back_buffer(output); output_clear_back_buffer(output);
output->pending.committed &= ~WLR_OUTPUT_STATE_BUFFER; state->committed &= ~WLR_OUTPUT_STATE_BUFFER;
return false; return false;
} }
@ -291,7 +296,7 @@ uint32_t wlr_output_preferred_read_format(struct wlr_output *output) {
return DRM_FORMAT_INVALID; return DRM_FORMAT_INVALID;
} }
if (!output_attach_back_buffer(output, NULL)) { if (!output_attach_back_buffer(output, &output->pending, NULL)) {
return false; return false;
} }