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

gl-renderer: Rename gl_renderer::output_create to output_window_create

Browse Source 
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>
This commit is contained in:
Miguel A. Vico 2016-05-18 17:43:00 +02:00 committed by Pekka Paalanen
parent dddc670c04
commit c095cde364
5 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libweston/compositor-drm.c
View File

@ -1836,12 +1836,12 @@ drm_output_init_egl(struct drm_output *output, struct drm_backend *b)
if (format[1]) if (format[1])
n_formats = 2; n_formats = 2;
if (gl_renderer->output_create(&output->base, if (gl_renderer->output_window_create(&output->base,
(EGLNativeWindowType)output->gbm_surface, (EGLNativeWindowType)output->gbm_surface,
output->gbm_surface, output->gbm_surface,
gl_renderer->opaque_attribs, gl_renderer->opaque_attribs,
format, format,
n_formats) < 0) { n_formats) < 0) {
weston_log("failed to create gl renderer output state\n"); weston_log("failed to create gl renderer output state\n");
gbm_surface_destroy(output->gbm_surface); gbm_surface_destroy(output->gbm_surface);
return -1; return -1;

12
libweston/compositor-wayland.c
View File

@ -700,12 +700,12 @@ wayland_output_init_gl_renderer(struct wayland_output *output)
return -1; 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,
output->gl.egl_window, output->gl.egl_window,
gl_renderer->alpha_attribs, gl_renderer->alpha_attribs,
NULL, NULL,
0) < 0) 0) < 0)
goto cleanup_window; goto cleanup_window;
return 0; return 0;

13
libweston/compositor-x11.c
View File

@ -923,12 +923,13 @@ x11_output_enable(struct weston_output *base)
* but eglCreateWindowSurface takes a Window. */ * but eglCreateWindowSurface takes a Window. */
Window xid = (Window) output->window; Window xid = (Window) output->window;
ret = gl_renderer->output_create(&output->base, ret = gl_renderer->output_window_create(
(EGLNativeWindowType) output->window, &output->base,
&xid, (EGLNativeWindowType) output->window,
gl_renderer->opaque_attribs, &xid,
NULL, gl_renderer->opaque_attribs,
0); NULL,
0);
if (ret < 0) if (ret < 0)
goto err; goto err;
} }

14
libweston/gl-renderer.c
View File

@ -2640,12 +2640,12 @@ static int
gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface); gl_renderer_setup(struct weston_compositor *ec, EGLSurface egl_surface);
static int static int
gl_renderer_output_create(struct weston_output *output, gl_renderer_output_window_create(struct weston_output *output,
EGLNativeWindowType window_for_legacy, EGLNativeWindowType window_for_legacy,
void *window_for_platform, void *window_for_platform,
const EGLint *attribs, const EGLint *attribs,
const EGLint *visual_id, const EGLint *visual_id,
int n_ids) int n_ids)
{ {
struct weston_compositor *ec = output->compositor; struct weston_compositor *ec = output->compositor;
struct gl_renderer *gr = get_renderer(ec); struct gl_renderer *gr = get_renderer(ec);
@ -3284,7 +3284,7 @@ WL_EXPORT struct gl_renderer_interface gl_renderer_interface = {
.display_create = gl_renderer_display_create, .display_create = gl_renderer_display_create,
.display = gl_renderer_display, .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_destroy = gl_renderer_output_destroy,
.output_surface = gl_renderer_output_surface, .output_surface = gl_renderer_output_surface,
.output_set_border = gl_renderer_output_set_border, .output_set_border = gl_renderer_output_set_border,

12
libweston/gl-renderer.h
View File

@ -69,12 +69,12 @@ struct gl_renderer_interface {
EGLDisplay (*display)(struct weston_compositor *ec); 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, EGLNativeWindowType window_for_legacy,
void *window_for_platform, void *window_for_platform,
const EGLint *attribs, const EGLint *attribs,
const EGLint *visual_id, const EGLint *visual_id,
const int n_ids); const int n_ids);
void (*output_destroy)(struct weston_output *output); void (*output_destroy)(struct weston_output *output);