Merge branch 'master' into session-lock-input-fix

This commit is contained in:
Erik Reider 2026-02-06 14:34:04 +01:00 committed by GitHub
commit 6b3b69e3c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
19 changed files with 224 additions and 124 deletions

View file

@ -267,6 +267,12 @@ enum render_bit_depth {
RENDER_BIT_DEPTH_10,
};
enum color_profile {
COLOR_PROFILE_DEFAULT, // default is Transform with NULL color_transform
COLOR_PROFILE_TRANSFORM, // use color_transform from output_config
COLOR_PROFILE_TRANSFORM_WITH_DEVICE_PRIMARIES, // create transform from wlr_output
};
/**
* Size and position configuration for a particular output.
*
@ -288,7 +294,7 @@ struct output_config {
int max_render_time; // In milliseconds
int adaptive_sync;
enum render_bit_depth render_bit_depth;
bool set_color_transform;
enum color_profile color_profile;
struct wlr_color_transform *color_transform;
int allow_tearing;
int hdr;

View file

@ -160,7 +160,7 @@ struct sway_debug {
extern struct sway_debug debug;
extern bool allow_unsupported_gpu;
extern bool unsupported_gpu_detected;
void sway_terminate(int exit_code);