system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-07-23 19:54:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

gl-renderer: Rename gl_renderer_create to gl_renderer_display_create

Browse source 
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>
This commit is contained in:
Miguel A. Vico 2016-05-18 17:41:07 +02:00 committed by Pekka Paalanen
parent 9c526e0e62
commit dddc670c04
5 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libweston/compositor-drm.c
View file

@ -1569,12 +1569,12 @@ drm_backend_create_gl_renderer(struct drm_backend *b)
if (format[1]) if (format[1])
n_formats = 3; n_formats = 3;
if (gl_renderer->create(b->compositor, if (gl_renderer->display_create(b->compositor,
EGL_PLATFORM_GBM_KHR, EGL_PLATFORM_GBM_KHR,
(void *)b->gbm, (void *)b->gbm,
gl_renderer->opaque_attribs, gl_renderer->opaque_attribs,
format, format,
n_formats) < 0) { n_formats) < 0) {
return -1; return -1;
} }

12
libweston/compositor-wayland.c
View file

@ -2349,12 +2349,12 @@ wayland_backend_create(struct weston_compositor *compositor,
} }
if (!b->use_pixman) { if (!b->use_pixman) {
if (gl_renderer->create(compositor, if (gl_renderer->display_create(compositor,
EGL_PLATFORM_WAYLAND_KHR, EGL_PLATFORM_WAYLAND_KHR,
b->parent.wl_display, b->parent.wl_display,
gl_renderer->alpha_attribs, gl_renderer->alpha_attribs,
NULL, NULL,
0) < 0) { 0) < 0) {
weston_log("Failed to initialize the GL renderer; " weston_log("Failed to initialize the GL renderer; "
"falling back to pixman.\n"); "falling back to pixman.\n");
b->use_pixman = true; b->use_pixman = true;

5
libweston/compositor-x11.c
View file

@ -1645,8 +1645,9 @@ init_gl_renderer(struct x11_backend *b)
if (!gl_renderer) if (!gl_renderer)
return -1; return -1;
ret = gl_renderer->create(b->compositor, EGL_PLATFORM_X11_KHR, (void *) b->dpy, ret = gl_renderer->display_create(b->compositor, EGL_PLATFORM_X11_KHR,
gl_renderer->opaque_attribs, NULL, 0); (void *) b->dpy,
gl_renderer->opaque_attribs, NULL, 0);
return ret; return ret;
} }

4
libweston/gl-renderer.c
View file

@ -2989,7 +2989,7 @@ gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) {
} }
static int 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, void *native_window, const EGLint *attribs,
const EGLint *visual_id, int n_ids) 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, .opaque_attribs = gl_renderer_opaque_attribs,
.alpha_attribs = gl_renderer_alpha_attribs, .alpha_attribs = gl_renderer_alpha_attribs,
.create = gl_renderer_create, .display_create = gl_renderer_display_create,
.display = gl_renderer_display, .display = gl_renderer_display,
.output_create = gl_renderer_output_create, .output_create = gl_renderer_output_create,
.output_destroy = gl_renderer_output_destroy, .output_destroy = gl_renderer_output_destroy,

12
libweston/gl-renderer.h
View file

@ -60,12 +60,12 @@ struct gl_renderer_interface {
const EGLint *opaque_attribs; const EGLint *opaque_attribs;
const EGLint *alpha_attribs; const EGLint *alpha_attribs;
int (*create)(struct weston_compositor *ec, int (*display_create)(struct weston_compositor *ec,
EGLenum platform, EGLenum platform,
void *native_window, void *native_window,
const EGLint *attribs, const EGLint *attribs,
const EGLint *visual_id, const EGLint *visual_id,
const int n_ids); const int n_ids);
EGLDisplay (*display)(struct weston_compositor *ec); EGLDisplay (*display)(struct weston_compositor *ec);