diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c index f61e3d9c..be782bea 100644 --- a/libweston/compositor-drm.c +++ b/libweston/compositor-drm.c @@ -1569,12 +1569,12 @@ drm_backend_create_gl_renderer(struct drm_backend *b) if (format[1]) n_formats = 3; - if (gl_renderer->create(b->compositor, - EGL_PLATFORM_GBM_KHR, - (void *)b->gbm, - gl_renderer->opaque_attribs, - format, - n_formats) < 0) { + if (gl_renderer->display_create(b->compositor, + EGL_PLATFORM_GBM_KHR, + (void *)b->gbm, + gl_renderer->opaque_attribs, + format, + n_formats) < 0) { return -1; } diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c index d26360ec..869659c7 100644 --- a/libweston/compositor-wayland.c +++ b/libweston/compositor-wayland.c @@ -2349,12 +2349,12 @@ wayland_backend_create(struct weston_compositor *compositor, } if (!b->use_pixman) { - if (gl_renderer->create(compositor, - EGL_PLATFORM_WAYLAND_KHR, - b->parent.wl_display, - gl_renderer->alpha_attribs, - NULL, - 0) < 0) { + if (gl_renderer->display_create(compositor, + EGL_PLATFORM_WAYLAND_KHR, + b->parent.wl_display, + gl_renderer->alpha_attribs, + NULL, + 0) < 0) { weston_log("Failed to initialize the GL renderer; " "falling back to pixman.\n"); b->use_pixman = true; diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c index 1c6de084..ccee8db7 100644 --- a/libweston/compositor-x11.c +++ b/libweston/compositor-x11.c @@ -1645,8 +1645,9 @@ init_gl_renderer(struct x11_backend *b) if (!gl_renderer) return -1; - ret = gl_renderer->create(b->compositor, EGL_PLATFORM_X11_KHR, (void *) b->dpy, - gl_renderer->opaque_attribs, NULL, 0); + ret = gl_renderer->display_create(b->compositor, EGL_PLATFORM_X11_KHR, + (void *) b->dpy, + gl_renderer->opaque_attribs, NULL, 0); return ret; } diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c index 3e8e5ab6..b33a19ab 100644 --- a/libweston/gl-renderer.c +++ b/libweston/gl-renderer.c @@ -2989,7 +2989,7 @@ gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) { } static int -gl_renderer_create(struct weston_compositor *ec, EGLenum platform, +gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, void *native_window, const EGLint *attribs, const EGLint *visual_id, int n_ids) { @@ -3282,7 +3282,7 @@ WL_EXPORT struct gl_renderer_interface gl_renderer_interface = { .opaque_attribs = gl_renderer_opaque_attribs, .alpha_attribs = gl_renderer_alpha_attribs, - .create = gl_renderer_create, + .display_create = gl_renderer_display_create, .display = gl_renderer_display, .output_create = gl_renderer_output_create, .output_destroy = gl_renderer_output_destroy, diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h index 37d000fe..32ba1536 100644 --- a/libweston/gl-renderer.h +++ b/libweston/gl-renderer.h @@ -60,12 +60,12 @@ struct gl_renderer_interface { const EGLint *opaque_attribs; const EGLint *alpha_attribs; - int (*create)(struct weston_compositor *ec, - EGLenum platform, - void *native_window, - const EGLint *attribs, - const EGLint *visual_id, - const int n_ids); + int (*display_create)(struct weston_compositor *ec, + EGLenum platform, + void *native_window, + const EGLint *attribs, + const EGLint *visual_id, + const int n_ids); EGLDisplay (*display)(struct weston_compositor *ec);