mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-06-13 14:32:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'output_color_format' into 'master'

Browse source 
Draft: output: add color_format state field

See merge request wlroots/wlroots!5364
This commit is contained in:
Igor Deordiev 2026-06-11 09:17:41 +00:00
commit 66df6f3a4d
11 changed files with 135 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/backend/drm/drm.h
View file

@ -162,6 +162,7 @@ struct wlr_drm_connector_state {
uint32_t fb_damage_clips;
int primary_in_fence_fd;
bool vrr_enabled;
uint32_t color_format;
uint32_t colorspace;
uint32_t hdr_output_metadata;
};

1
include/backend/drm/properties.h
View file

@ -22,6 +22,7 @@ struct wlr_drm_connector_props {
uint32_t panel_orientation; // not guaranteed to exist
uint32_t content_type; // not guaranteed to exist
uint32_t max_bpc; // not guaranteed to exist
uint32_t color_format; // not guaranteed to exist
// atomic-modesetting only

32
include/wlr/types/wlr_output.h
View file

@ -78,6 +78,21 @@ enum wlr_output_state_field {
WLR_OUTPUT_STATE_COLOR_TRANSFORM = 1 << 12,
WLR_OUTPUT_STATE_IMAGE_DESCRIPTION = 1 << 13,
WLR_OUTPUT_STATE_COLOR_REPRESENTATION = 1 << 14,
WLR_OUTPUT_STATE_COLOR_FORMAT = 1 << 15,
};
/**
* DRM color format for output connectors.
*
* These values match enum drm_connector_color_format in the kernel.
* AUTO (0) is the default and lets the driver pick.
*/
enum wlr_output_color_format {
WLR_OUTPUT_COLOR_FORMAT_AUTO = 0,
WLR_OUTPUT_COLOR_FORMAT_RGB444,
WLR_OUTPUT_COLOR_FORMAT_YCBCR444,
WLR_OUTPUT_COLOR_FORMAT_YCBCR422,
WLR_OUTPUT_COLOR_FORMAT_YCBCR420,
};
enum wlr_output_state_mode_type {
@ -165,6 +180,8 @@ struct wlr_output_state {
struct wlr_color_transform *color_transform;
struct wlr_output_image_description *image_description;
uint32_t color_format; // enum wlr_output_color_format
};
struct wlr_output_impl;
@ -210,6 +227,7 @@ struct wlr_output {
enum wl_output_transform transform;
enum wlr_output_adaptive_sync_status adaptive_sync_status;
uint32_t render_format;
enum wlr_output_color_format color_format;
enum wlr_color_encoding color_encoding;
enum wlr_color_range color_range;
const struct wlr_output_image_description *image_description;
@ -641,6 +659,20 @@ void wlr_output_state_set_color_encoding_and_range(
struct wlr_output_state *state,
enum wlr_color_encoding encoding, enum wlr_color_range range);
/**
* Sets the color format for an output. The color format determines the color
* encoding sent to the display (RGB, YCbCr 4:4:4, YCbCr 4:2:2, YCbCr 4:2:0).
*
* The default value is WLR_OUTPUT_COLOR_FORMAT_AUTO.
*
* Not all connectors support all color formats. If the connector doesn't
* support the "color format" DRM property, this setting is ignored.
*
* This state will be applied once wlr_output_commit_state() is called.
*/
void wlr_output_state_set_color_format(struct wlr_output_state *state,
enum wlr_output_color_format color_format);
/**
* Copies the output state from src to dst. It is safe to then
* wlr_output_state_finish() src and have dst still be valid.

1
include/wlr/types/wlr_output_management_v1.h
View file

@ -59,6 +59,7 @@ struct wlr_output_head_v1_state {
enum wl_output_transform transform;
float scale;
bool adaptive_sync_enabled;
enum wlr_output_color_format color_format;
};
struct wlr_output_head_v1 {