gl-renderer: Rename gl_renderer::output_create to output_window_create
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 <mvicomoya@nvidia.com>
Reviewed-by: Andy Ritger <aritger@nvidia.com>
Reviewed-by: James Jones <jajones@nvidia.com>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
index be782be..41ad9de 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -1836,12 +1836,12 @@
if (format[1])
n_formats = 2;
- if (gl_renderer->output_create(&output->base,
- (EGLNativeWindowType)output->gbm_surface,
- output->gbm_surface,
- gl_renderer->opaque_attribs,
- format,
- n_formats) < 0) {
+ if (gl_renderer->output_window_create(&output->base,
+ (EGLNativeWindowType)output->gbm_surface,
+ output->gbm_surface,
+ gl_renderer->opaque_attribs,
+ format,
+ n_formats) < 0) {
weston_log("failed to create gl renderer output state\n");
gbm_surface_destroy(output->gbm_surface);
return -1;
diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
index 869659c..1a46c4e 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -700,12 +700,12 @@
return -1;
}
- if (gl_renderer->output_create(&output->base,
- output->gl.egl_window,
- output->gl.egl_window,
- gl_renderer->alpha_attribs,
- NULL,
- 0) < 0)
+ if (gl_renderer->output_window_create(&output->base,
+ output->gl.egl_window,
+ output->gl.egl_window,
+ gl_renderer->alpha_attribs,
+ NULL,
+ 0) < 0)
goto cleanup_window;
return 0;
diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
index ccee8db..0804591 100644
--- a/libweston/compositor-x11.c
+++ b/libweston/compositor-x11.c
@@ -923,12 +923,13 @@
* but eglCreateWindowSurface takes a Window. */
Window xid = (Window) output->window;
- ret = gl_renderer->output_create(&output->base,
- (EGLNativeWindowType) output->window,
- &xid,
- gl_renderer->opaque_attribs,
- NULL,
- 0);
+ ret = gl_renderer->output_window_create(
+ &output->base,
+ (EGLNativeWindowType) output->window,
+ &xid,
+ gl_renderer->opaque_attribs,
+ NULL,
+ 0);
if (ret < 0)
goto err;
}
diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
index b33a19a..7c9a1b0 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -2640,12 +2640,12 @@
gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface);
static int
-gl_renderer_output_create(struct weston_output *output,
- EGLNativeWindowType window_for_legacy,
- void *window_for_platform,
- const EGLint *attribs,
- const EGLint *visual_id,
- int n_ids)
+gl_renderer_output_window_create(struct weston_output *output,
+ EGLNativeWindowType window_for_legacy,
+ void *window_for_platform,
+ const EGLint *attribs,
+ const EGLint *visual_id,
+ int n_ids)
{
struct weston_compositor *ec = output->compositor;
struct gl_renderer *gr = get_renderer(ec);
@@ -3284,7 +3284,7 @@
.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 32ba153..ee32790 100644
--- a/libweston/gl-renderer.h
+++ b/libweston/gl-renderer.h
@@ -69,12 +69,12 @@
EGLDisplay (*display)(struct weston_compositor *ec);
- int (*output_create)(struct weston_output *output,
- EGLNativeWindowType window_for_legacy,
- void *window_for_platform,
- const EGLint *attribs,
- const EGLint *visual_id,
- const int n_ids);
+ int (*output_window_create)(struct weston_output *output,
+ EGLNativeWindowType window_for_legacy,
+ void *window_for_platform,
+ const EGLint *attribs,
+ const EGLint *visual_id,
+ const int n_ids);
void (*output_destroy)(struct weston_output *output);