gl-renderer: Rename gl_renderer_create to gl_renderer_display_create
No functional change. This patch only renames gl_renderer_create() to
gl_renderer_display_create(), which is something more descriptive of
what the function does.
Signed-off-by: Miguel A Vico Moya <mvicomoya@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 f61e3d9..be782be 100644
--- a/libweston/compositor-drm.c
+++ b/libweston/compositor-drm.c
@@ -1569,12 +1569,12 @@
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 d26360e..869659c 100644
--- a/libweston/compositor-wayland.c
+++ b/libweston/compositor-wayland.c
@@ -2349,12 +2349,12 @@
}
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 1c6de08..ccee8db 100644
--- a/libweston/compositor-x11.c
+++ b/libweston/compositor-x11.c
@@ -1645,8 +1645,9 @@
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 3e8e5ab..b33a19a 100644
--- a/libweston/gl-renderer.c
+++ b/libweston/gl-renderer.c
@@ -2989,7 +2989,7 @@
}
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 @@
.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 37d000f..32ba153 100644
--- a/libweston/gl-renderer.h
+++ b/libweston/gl-renderer.h
@@ -60,12 +60,12 @@
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);