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

compositor: add use-gl option to headless

Browse Source 
This will allow one to run the headless backend with GL-renderer.

Implements: https://gitlab.freedesktop.org/wayland/weston/issues/278

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2019-09-20 14:35:58 +03:00
committed by Pekka Paalanen
parent 5104d7b2af
commit c57a8cccd3
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compositor/main.c
+8
View File
@@ -680,6 +680,7 @@ usage(int error_code)
" --transform=TR\tThe output transformation, TR is one of:\n" " --transform=TR\tThe output transformation, TR is one of:\n"
"\tnormal 90 180 270 flipped flipped-90 flipped-180 flipped-270\n" "\tnormal 90 180 270 flipped flipped-90 flipped-180 flipped-270\n"
" --use-pixman\t\tUse the pixman (CPU) renderer (default: no rendering)\n" " --use-pixman\t\tUse the pixman (CPU) renderer (default: no rendering)\n"
" --use-gl\t\tUse the GL renderer (default: no rendering)\n"
" --no-outputs\t\tDo not create any virtual outputs\n" " --no-outputs\t\tDo not create any virtual outputs\n"
"\n"); "\n");
#endif #endif
@@ -2554,6 +2555,8 @@ load_headless_backend(struct weston_compositor *c,
char *transform = NULL; char *transform = NULL;
int32_t use_pixman_config_ = 0; int32_t use_pixman_config_ = 0;
int use_pixman_ = 0; int use_pixman_ = 0;
int32_t use_gl_config_ = 0;
int use_gl_ = 0;
struct wet_output_config *parsed_options = wet_init_parsed_options(c); struct wet_output_config *parsed_options = wet_init_parsed_options(c);
if (!parsed_options) if (!parsed_options)
@@ -2563,17 +2566,22 @@ load_headless_backend(struct weston_compositor *c,
weston_config_section_get_bool(section, "use-pixman", &use_pixman_config_, weston_config_section_get_bool(section, "use-pixman", &use_pixman_config_,
use_pixman_config_); use_pixman_config_);
use_pixman_ = use_pixman_config_; use_pixman_ = use_pixman_config_;
weston_config_section_get_bool(section, "use-gl", &use_gl_config_,
use_gl_config_);
use_gl_ = use_gl_config_;
const struct weston_option options[] = { const struct weston_option options[] = {
{ WESTON_OPTION_INTEGER, "width", 0, &parsed_options->width }, { WESTON_OPTION_INTEGER, "width", 0, &parsed_options->width },
{ WESTON_OPTION_INTEGER, "height", 0, &parsed_options->height }, { WESTON_OPTION_INTEGER, "height", 0, &parsed_options->height },
{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman_ }, { WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman_ },
{ WESTON_OPTION_BOOLEAN, "use-gl", 0, &use_gl_ },
{ WESTON_OPTION_STRING, "transform", 0, &transform }, { WESTON_OPTION_STRING, "transform", 0, &transform },
{ WESTON_OPTION_BOOLEAN, "no-outputs", 0, &no_outputs }, { WESTON_OPTION_BOOLEAN, "no-outputs", 0, &no_outputs },
}; };
parse_options(options, ARRAY_LENGTH(options), argc, argv); parse_options(options, ARRAY_LENGTH(options), argc, argv);
config.use_pixman = use_pixman_; config.use_pixman = use_pixman_;
config.use_gl = use_gl_;
if (transform) { if (transform) {
if (weston_parse_transform(transform, &parsed_options->transform) < 0) { if (weston_parse_transform(transform, &parsed_options->transform) < 0) {