mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2026-06-13 14:33:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 47e2655046 into f4b9bdab65

Browse source
This commit is contained in:
Christopher Snowhill 2026-06-08 21:16:08 -07:00 • committed by GitHub
commit 55e402fe88
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/output.c
View file

@ -85,12 +85,16 @@ uint32_t output_formats_10bit[] = {
}; };
static bool static bool
output_set_render_format(struct output *output, uint32_t candidates[], size_t count) output_set_render_format(struct output *output, uint32_t candidates[], size_t count,
const struct wlr_drm_format_set *formats)
{ {
for (size_t i = 0; i < count; i++) { for (size_t i = 0; i < count; i++) {
wlr_output_state_set_render_format(&output->pending, candidates[i]); const uint32_t format = candidates[i];
if (wlr_output_test_state(output->wlr_output, &output->pending)) { if (!formats || wlr_drm_format_set_get(formats, format)) {
return true; wlr_output_state_set_render_format(&output->pending, format);
if (wlr_output_test_state(output->wlr_output, &output->pending)) {
return true;
}
} }
} }
return false; return false;
@ -149,6 +153,7 @@ output_state_setup_hdr(struct output *output, bool silent)
{ {
uint32_t render_format = output->wlr_output->render_format; uint32_t render_format = output->wlr_output->render_format;
const char *unsupported_reason = NULL; const char *unsupported_reason = NULL;
const struct wlr_drm_format_set *formats = NULL;
bool hdr_supported = output_supports_hdr(output->wlr_output, bool hdr_supported = output_supports_hdr(output->wlr_output,
&unsupported_reason); &unsupported_reason);
bool hdr_succeeded = false; bool hdr_succeeded = false;
@ -173,15 +178,17 @@ output_state_setup_hdr(struct output *output, bool silent)
*/ */
hdr_succeeded = true; hdr_succeeded = true;
} else if (render_bit_depth == LAB_RENDER_BIT_DEPTH_10) { } else if (render_bit_depth == LAB_RENDER_BIT_DEPTH_10) {
formats = wlr_output_get_primary_formats(output->wlr_output,
WLR_BUFFER_CAP_DMABUF);
hdr_succeeded = output_set_render_format(output, output_formats_10bit, hdr_succeeded = output_set_render_format(output, output_formats_10bit,
ARRAY_SIZE(output_formats_10bit)); ARRAY_SIZE(output_formats_10bit), formats);
if (!hdr_succeeded) { if (!hdr_succeeded) {
if (!silent) { if (!silent) {
wlr_log(WLR_INFO, "No 10 bit color formats" wlr_log(WLR_INFO, "No 10 bit color formats"
" supported, HDR disabled."); " supported, HDR disabled.");
} }
if (!output_set_render_format(output, output_formats_8bit, if (!output_set_render_format(output, output_formats_8bit,
ARRAY_SIZE(output_formats_8bit))) { ARRAY_SIZE(output_formats_8bit), formats)) {
if (!silent) { if (!silent) {
wlr_log(WLR_ERROR, "No 8 bit color formats" wlr_log(WLR_ERROR, "No 8 bit color formats"
" supported either!"); " supported either!");
@ -189,8 +196,10 @@ output_state_setup_hdr(struct output *output, bool silent)
} }
} }
} else { } else {
formats = wlr_output_get_primary_formats(output->wlr_output,
WLR_BUFFER_CAP_DMABUF);
if (!output_set_render_format(output, output_formats_8bit, if (!output_set_render_format(output, output_formats_8bit,
ARRAY_SIZE(output_formats_8bit)) && !silent) { ARRAY_SIZE(output_formats_8bit), formats) && !silent) {
wlr_log(WLR_ERROR, "No 8 bit color formats supported!"); wlr_log(WLR_ERROR, "No 8 bit color formats supported!");
} }
} }