From 4aeeb96a3381cc2bde66ca437f150a6764cf0c95 Mon Sep 17 00:00:00 2001 From: "Miguel A. Vico" Date: Wed, 30 Mar 2016 15:09:14 +0200 Subject: [PATCH 02/11] gl-renderer: Rename gl_renderer::output_create to output_window_create X-NVConfidentiality: public No functional change. This patch renames gl_renderer_output_create() to gl_renderer_output_window_create(), which is something more descriptive of what the function does. Signed-off-by: Miguel A Vico Moya Reviewed-by: Andy Ritger Reviewed-by: James Jones [aplattner@nvidia.com: rebased on top of Weston 1.12.0] --- libweston/compositor-drm.c | 2 +- libweston/compositor-wayland.c | 2 +- libweston/compositor-x11.c | 2 +- libweston/gl-renderer.c | 4 ++-- libweston/gl-renderer.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index 4046c8d6435c..87cd7be22344 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -1886,7 +1886,7 @@ drm_output_init_egl(struct drm_output *output, struct drm_backend *b) if (format[1]) n_formats = 2; - if (gl_renderer->output_create(&output->base, + if (gl_renderer->output_window_create(&output->base, (EGLNativeWindowType)output->gbm_surface, output->gbm_surface, gl_renderer->opaque_attribs, diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c index 1a9db60cd644..b434700fa0ff 100644 --- a/libweston/compositor-wayland.c +++ b/libweston/compositor-wayland.c @@ -671,7 +671,7 @@ wayland_output_init_gl_renderer(struct wayland_output *output) return -1; } - if (gl_renderer->output_create(&output->base, + if (gl_renderer->output_window_create(&output->base, output->gl.egl_window, output->gl.egl_window, gl_renderer->alpha_attribs, diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c index 97e151b27b71..0664e220d10f 100644 --- a/libweston/compositor-x11.c +++ b/libweston/compositor-x11.c @@ -953,7 +953,7 @@ x11_backend_create_output(struct x11_backend *b, int x, int y, * but eglCreateWindowSurface takes a Window. */ Window xid = (Window) output->window; - ret = gl_renderer->output_create(&output->base, + ret = gl_renderer->output_window_create(&output->base, (EGLNativeWindowType) output->window, &xid, gl_renderer->opaque_attribs, diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c index 9d5d65b03e46..0015268d210a 100644 --- a/libweston/gl-renderer.c +++ b/libweston/gl-renderer.c @@ -2544,7 +2544,7 @@ static int gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface); static int -gl_renderer_output_create(struct weston_output *output, +gl_renderer_output_window_create(struct weston_output *output, EGLNativeWindowType window_for_legacy, void *window_for_platform, const EGLint *attribs, @@ -3183,7 +3183,7 @@ WL_EXPORT struct gl_renderer_interface gl_renderer_interface = { .display_create = gl_renderer_display_create, .display = gl_renderer_display, - .output_create = gl_renderer_output_create, + .output_window_create = gl_renderer_output_window_create, .output_destroy = gl_renderer_output_destroy, .output_surface = gl_renderer_output_surface, .output_set_border = gl_renderer_output_set_border, diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h index 71d5aab51c76..5b3b68a8e4fa 100644 --- a/libweston/gl-renderer.h +++ b/libweston/gl-renderer.h @@ -69,7 +69,7 @@ struct gl_renderer_interface { EGLDisplay (*display)(struct weston_compositor *ec); - int (*output_create)(struct weston_output *output, + int (*output_window_create)(struct weston_output *output, EGLNativeWindowType window_for_legacy, void *window_for_platform, const EGLint *attribs, -- 2.10.0