hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-02 03:45:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

output: use pending render format if any

Browse source 
If a modeset contains a render format change, use that instead of
the current one stored in wlr_output.render_format.

This fixes render_bit_depth configuration not being applied without
a second modeset in Sway.
This commit is contained in:
Simon Ser 2023-05-26 13:42:17 +02:00 committed by Alexander Orzechowski
parent 28e8d92263
commit 2c6aeed7d6
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
types/output/swapchain.c
View file

@ -10,14 +10,14 @@
#include "types/wlr_output.h" #include "types/wlr_output.h"
static struct wlr_swapchain *create_swapchain(struct wlr_output *output, static struct wlr_swapchain *create_swapchain(struct wlr_output *output,
int width, int height, bool allow_modifiers) { int width, int height, uint32_t render_format, bool allow_modifiers) {
struct wlr_allocator *allocator = output->allocator; struct wlr_allocator *allocator = output->allocator;
assert(output->allocator != NULL); assert(output->allocator != NULL);
const struct wlr_drm_format_set *display_formats = const struct wlr_drm_format_set *display_formats =
wlr_output_get_primary_formats(output, allocator->buffer_caps); wlr_output_get_primary_formats(output, allocator->buffer_caps);
struct wlr_drm_format format = {0}; struct wlr_drm_format format = {0};
if (!output_pick_format(output, display_formats, &format, output->render_format)) { if (!output_pick_format(output, display_formats, &format, render_format)) {
wlr_log(WLR_ERROR, "Failed to pick primary buffer format for output '%s'", wlr_log(WLR_ERROR, "Failed to pick primary buffer format for output '%s'",
output->name); output->name);
return NULL; return NULL;
@ -73,15 +73,20 @@ bool wlr_output_configure_primary_swapchain(struct wlr_output *output,
int width, height; int width, height;
output_pending_resolution(output, state, &width, &height); output_pending_resolution(output, state, &width, &height);
uint32_t format = output->render_format;
if (state->committed & WLR_OUTPUT_STATE_RENDER_FORMAT) {
format = state->render_format;
}
// Re-use the existing swapchain if possible // Re-use the existing swapchain if possible
struct wlr_swapchain *old_swapchain = *swapchain_ptr; struct wlr_swapchain *old_swapchain = *swapchain_ptr;
if (old_swapchain != NULL && if (old_swapchain != NULL &&
old_swapchain->width == width && old_swapchain->height == height && old_swapchain->width == width && old_swapchain->height == height &&
old_swapchain->format.format == output->render_format) { old_swapchain->format.format == format) {
return true; return true;
} }
struct wlr_swapchain *swapchain = create_swapchain(output, width, height, true); struct wlr_swapchain *swapchain = create_swapchain(output, width, height, format, true);
if (swapchain == NULL) { if (swapchain == NULL) {
wlr_log(WLR_ERROR, "Failed to create swapchain for output '%s'", output->name); wlr_log(WLR_ERROR, "Failed to create swapchain for output '%s'", output->name);
return false; return false;
@ -92,7 +97,7 @@ bool wlr_output_configure_primary_swapchain(struct wlr_output *output,
wlr_log(WLR_DEBUG, "Output test failed on '%s', retrying without modifiers", wlr_log(WLR_DEBUG, "Output test failed on '%s', retrying without modifiers",
output->name); output->name);
wlr_swapchain_destroy(swapchain); wlr_swapchain_destroy(swapchain);
swapchain = create_swapchain(output, width, height, false); swapchain = create_swapchain(output, width, height, format, false);
if (swapchain == NULL) { if (swapchain == NULL) {
wlr_log(WLR_ERROR, "Failed to create modifier-less swapchain for output '%s'", wlr_log(WLR_ERROR, "Failed to create modifier-less swapchain for output '%s'",
output->name); output->name);