mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "compositor: add weston.ini option use-renderer-shadow"

Browse Source 
This reverts commit 81ef6d0ab3.

This also removes a bit from "tests: ensure color-lcms plugin loads".

Use of the shadow buffer is determined automatically based on
color transformations by the previous commit
"gl-renderer: use shadow framebuffer automatically".

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2021-04-15 16:14:03 +03:00
parent d2cfbff186
commit 478123b967
3 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
compositor/main.c
View File

@ -1290,29 +1290,6 @@ wet_output_set_transform(struct weston_output *output,
return 0; return 0;
} }
static int
wet_output_set_renderer_shadow(struct weston_output *output,
struct weston_config_section *section)
{
bool use_shadow = false;
if (section) {
weston_config_section_get_bool(section,
"use-renderer-shadow",
&use_shadow, false);
}
if (use_shadow) {
if (!weston_output_set_renderer_shadow_buffer(output)) {
weston_log("Output \"%s\" does not support use-renderer-shadow.\n",
output->name);
return -1;
}
}
return 0;
}
static void static void
allow_content_protection(struct weston_output *output, allow_content_protection(struct weston_output *output,
struct weston_config_section *section) struct weston_config_section *section)
@ -1830,9 +1807,6 @@ drm_backend_output_configure(struct weston_output *output,
allow_content_protection(output, section); allow_content_protection(output, section);
if (wet_output_set_renderer_shadow(output, section) < 0)
return -1;
return 0; return 0;
} }
@ -2643,12 +2617,6 @@ headless_backend_output_configure(struct weston_output *output)
.scale = 1, .scale = 1,
.transform = WL_OUTPUT_TRANSFORM_NORMAL .transform = WL_OUTPUT_TRANSFORM_NORMAL
}; };
struct weston_config *wc = wet_get_config(output->compositor);
struct weston_config_section *section;
section = weston_config_get_section(wc, "output", "name", output->name);
if (wet_output_set_renderer_shadow(output, section) < 0)
return -1;
return wet_configure_windowed_output_from_config(output, &defaults); return wet_configure_windowed_output_from_config(output, &defaults);
} }

13
man/weston.ini.man
View File

@ -565,19 +565,6 @@ A comma separated list of the IDs of applications to place on this output.
These IDs should match the application IDs as set with the xdg_shell.set_app_id These IDs should match the application IDs as set with the xdg_shell.set_app_id
request. Currently, this option is supported by kiosk-shell. request. Currently, this option is supported by kiosk-shell.
.RE .RE
.TP 7
.BI "use-renderer-shadow=" boolean
Use a shadow framebuffer enabling two-pass composition for possible color
mangling operations. This is an experimental feature that is only available
on GL-renderer combined with headless or DRM backend. Setting this to true may
turn on various composite rendering effects and/or stop composite-bypass in
DRM-backend.
.I Only for developer testing.
Defaults to
.BR false .
.RE
.SH "INPUT-METHOD SECTION" .SH "INPUT-METHOD SECTION"
.TP 7 .TP 7
.BI "path=" "@weston_libexecdir@/weston-keyboard" .BI "path=" "@weston_libexecdir@/weston-keyboard"

5
tests/color-manager-test.c
View File

@ -39,10 +39,7 @@ fixture_setup(struct weston_test_harness *harness)
weston_ini_setup(&setup, weston_ini_setup(&setup,
cfgln("[core]"), cfgln("[core]"),
cfgln("color-management=true"), cfgln("color-management=true"));
cfgln("[output]"),
cfgln("name=headless"),
cfgln("use-renderer-shadow=true"));
return weston_test_harness_execute_as_client(harness, &setup); return weston_test_harness_execute_as_client(harness, &setup);
} }