mirror of
https://github.com/yshui/picom.git
synced 2024-11-11 13:51:02 -05:00
Merge pull request #1007 from absolutelynothelix/egl-allow-max-brightness
This commit is contained in:
commit
e2ecef92ba
1 changed files with 11 additions and 13 deletions
|
@ -805,10 +805,10 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable,
|
||||||
if (opt->window_shader_fg || opt->window_shader_fg_rules) {
|
if (opt->window_shader_fg || opt->window_shader_fg_rules) {
|
||||||
if (opt->backend == BKEND_XRENDER || opt->legacy_backends) {
|
if (opt->backend == BKEND_XRENDER || opt->legacy_backends) {
|
||||||
log_warn(opt->backend == BKEND_XRENDER
|
log_warn(opt->backend == BKEND_XRENDER
|
||||||
? "Shader interface is not available for the "
|
? "Shader interface is not supported by the xrender "
|
||||||
"xrender backend."
|
"backend."
|
||||||
: "The new shader interface is not available for "
|
: "The new shader interface is not supported by the "
|
||||||
"the legacy glx backend. You may want to use "
|
"legacy glx backend. You may want to use "
|
||||||
"--glx-fshader-win instead.");
|
"--glx-fshader-win instead.");
|
||||||
opt->window_shader_fg = NULL;
|
opt->window_shader_fg = NULL;
|
||||||
c2_list_free(&opt->window_shader_fg_rules, free);
|
c2_list_free(&opt->window_shader_fg_rules, free);
|
||||||
|
@ -824,18 +824,16 @@ bool get_cfg(options_t *opt, int argc, char *const *argv, bool shadow_enable,
|
||||||
opt->inactive_dim = normalize_d(opt->inactive_dim);
|
opt->inactive_dim = normalize_d(opt->inactive_dim);
|
||||||
opt->frame_opacity = normalize_d(opt->frame_opacity);
|
opt->frame_opacity = normalize_d(opt->frame_opacity);
|
||||||
opt->shadow_opacity = normalize_d(opt->shadow_opacity);
|
opt->shadow_opacity = normalize_d(opt->shadow_opacity);
|
||||||
|
|
||||||
opt->max_brightness = normalize_d(opt->max_brightness);
|
opt->max_brightness = normalize_d(opt->max_brightness);
|
||||||
if (opt->max_brightness < 1.0) {
|
if (opt->max_brightness < 1.0) {
|
||||||
if (opt->use_damage) {
|
if (opt->backend == BKEND_XRENDER || opt->legacy_backends) {
|
||||||
log_warn("--max-brightness requires --no-use-damage. Falling "
|
log_warn("--max-brightness is not supported by the %s backend. "
|
||||||
"back to 1.0");
|
"Falling back to 1.0.",
|
||||||
|
opt->backend == BKEND_XRENDER ? "xrender" : "legacy glx");
|
||||||
opt->max_brightness = 1.0;
|
opt->max_brightness = 1.0;
|
||||||
}
|
} else if (opt->use_damage) {
|
||||||
|
log_warn("--max-brightness requires --no-use-damage. Falling "
|
||||||
if (opt->legacy_backends || opt->backend != BKEND_GLX) {
|
"back to 1.0.");
|
||||||
log_warn("--max-brightness requires the new glx "
|
|
||||||
"backend. Falling back to 1.0");
|
|
||||||
opt->max_brightness = 1.0;
|
opt->max_brightness = 1.0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue