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

gl-renderer: Replace window-create args with struct

Browse Source 
gl_rendererer's output_window_create has a lot of arguments now. Add a
structure for the options to make it more clear what is what.
This is in preparation for adding bare-integer arguments which are ripe
for confusion when passing positional arguments.

Signed-off-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Daniel Stone
2020-03-06 13:04:18 +00:00
committed by Pekka Paalanen
parent c890c384c8
commit db6e6e1ec5
5 changed files with 49 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/backend-x11/x11.c
+15 -11
View File
@@ -854,14 +854,16 @@ x11_output_switch_mode(struct weston_output *base, struct weston_mode *mode)
}
} else {
Window xid = (Window) output->window;
const struct gl_renderer_output_options options = {
.window_for_legacy = (EGLNativeWindowType) output->window,
.window_for_platform = &xid,
.drm_formats = x11_formats,
.drm_formats_count = ARRAY_LENGTH(x11_formats),
};
gl_renderer->output_destroy(&output->base);
ret = gl_renderer->output_window_create(&output->base,
(EGLNativeWindowType) output->window,
&xid,
x11_formats,
ARRAY_LENGTH(x11_formats));
ret = gl_renderer->output_window_create(&output->base, &options);
if (ret < 0)
return -1;
}
@@ -1030,13 +1032,15 @@ x11_output_enable(struct weston_output *base)
/* eglCreatePlatformWindowSurfaceEXT takes a Window*
* but eglCreateWindowSurface takes a Window. */
Window xid = (Window) output->window;
const struct gl_renderer_output_options options = {
.window_for_legacy = (EGLNativeWindowType) output->window,
.window_for_platform = &xid,
.drm_formats = x11_formats,
.drm_formats_count = ARRAY_LENGTH(x11_formats),
};
ret = gl_renderer->output_window_create(
&output->base,
(EGLNativeWindowType) output->window,
&xid,
x11_formats,
ARRAY_LENGTH(x11_formats));
ret = gl_renderer->output_window_create(&output->base,
&options);
if (ret < 0)
goto err;