diff options
| author | Miguel A. Vico <mvicomoya@nvidia.com> | 2016-03-30 15:09:14 +0200 |
|---|---|---|
| committer | Miguel A. Vico <mvicomoya@nvidia.com> | 2016-05-08 11:54:52 +0200 |
| commit | 82c4b9a3791846191b56a6c5c57aa13398c20179 (patch) | |
| tree | 64524463cfd13ed18cd3c81b384a930c866f0a52 | |
| parent | 5292b7f1a2be20af2231d0b2bbafe2c7f537c99d (diff) | |
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>
| -rw-r--r-- | src/compositor-drm.c | 2 | ||||
| -rw-r--r-- | src/compositor-fbdev.c | 2 | ||||
| -rw-r--r-- | src/compositor-wayland.c | 2 | ||||
| -rw-r--r-- | src/compositor-x11.c | 2 | ||||
| -rw-r--r-- | src/gl-renderer.c | 4 | ||||
| -rw-r--r-- | src/gl-renderer.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/src/compositor-drm.c b/src/compositor-drm.c index 9c58710e..4b4a3e7c 100644 --- a/src/compositor-drm.c +++ b/src/compositor-drm.c @@ -1852,7 +1852,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/src/compositor-fbdev.c b/src/compositor-fbdev.c index c6ffcd7e..21a24fd4 100644 --- a/src/compositor-fbdev.c +++ b/src/compositor-fbdev.c @@ -510,7 +510,7 @@ fbdev_output_create(struct fbdev_backend *backend, goto out_hw_surface; } else { setenv("HYBRIS_EGLPLATFORM", "wayland", 1); - if (gl_renderer->output_create(&output->base, + if (gl_renderer->output_window_create(&output->base, (EGLNativeWindowType)NULL, NULL, gl_renderer->opaque_attribs, NULL, 0) < 0) { diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c index e4595c76..58d9ae76 100644 --- a/src/compositor-wayland.c +++ b/src/compositor-wayland.c @@ -658,7 +658,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/src/compositor-x11.c b/src/compositor-x11.c index 78b9c62f..6b61cee6 100644 --- a/src/compositor-x11.c +++ b/src/compositor-x11.c @@ -928,7 +928,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/src/gl-renderer.c b/src/gl-renderer.c index 197e5c2a..784cacbc 100644 --- a/src/gl-renderer.c +++ b/src/gl-renderer.c @@ -2547,7 +2547,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, @@ -3149,7 +3149,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/src/gl-renderer.h b/src/gl-renderer.h index cd67a890..ae9bf0f0 100644 --- a/src/gl-renderer.h +++ b/src/gl-renderer.h @@ -84,7 +84,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, |