In preparation for follow-on changes to support frame presentation through EGLDevice+EGLOutput, this change renames <attribs> parameter of gl_renderer_display_create() and gl_renderer_output_window_create() to <config_attribs>
Signed-off-by: Miguel A Vico Moya <[email protected]> Reviewed-by: Andy Ritger <[email protected]> Reviewed-by: James Jones <[email protected]> --- src/gl-renderer.c | 8 ++++---- src/gl-renderer.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gl-renderer.c b/src/gl-renderer.c index 9e75025..51f1eec 100644 --- a/src/gl-renderer.c +++ b/src/gl-renderer.c @@ -2550,7 +2550,7 @@ static int gl_renderer_output_window_create(struct weston_output *output, EGLNativeWindowType window_for_legacy, void *window_for_platform, - const EGLint *attribs, + const EGLint *config_attribs, const EGLint *visual_id, int n_ids) { @@ -2560,7 +2560,7 @@ gl_renderer_output_window_create(struct weston_output *output, EGLConfig egl_config; int i; - if (egl_choose_config(gr, attribs, visual_id, + if (egl_choose_config(gr, config_attribs, visual_id, n_ids, &egl_config) == -1) { weston_log("failed to choose EGL config for output\n"); return -1; @@ -2874,7 +2874,7 @@ platform_to_extension(EGLenum platform) static int gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, - void *native_window, const EGLint *attribs, + void *native_window, const EGLint *config_attribs, const EGLint *visual_id, int n_ids) { struct gl_renderer *gr; @@ -2938,7 +2938,7 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, goto fail_with_error; } - if (egl_choose_config(gr, attribs, visual_id, + if (egl_choose_config(gr, config_attribs, visual_id, n_ids, &gr->egl_config) < 0) { weston_log("failed to choose EGL config\n"); goto fail_terminate; diff --git a/src/gl-renderer.h b/src/gl-renderer.h index 30b5918..750a909 100644 --- a/src/gl-renderer.h +++ b/src/gl-renderer.h @@ -78,7 +78,7 @@ struct gl_renderer_interface { int (*display_create)(struct weston_compositor *ec, EGLenum platform, void *native_window, - const EGLint *attribs, + const EGLint *config_attribs, const EGLint *visual_id, const int n_ids); @@ -87,7 +87,7 @@ struct gl_renderer_interface { int (*output_window_create)(struct weston_output *output, EGLNativeWindowType window_for_legacy, void *window_for_platform, - const EGLint *attribs, + const EGLint *config_attribs, const EGLint *visual_id, const int n_ids); -- 2.8.0 _______________________________________________ wayland-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/wayland-devel
