summarylogtreecommitdiffstats
path: root/0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch
diff options
context:
space:
mode:
Diffstat (limited to '0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch')
-rw-r--r--0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch131
1 files changed, 0 insertions, 131 deletions
diff --git a/0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch b/0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch
deleted file mode 100644
index 6d53946b041..00000000000
--- a/0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From b573a9c1037449125398c49578e286f2da6dcc29 Mon Sep 17 00:00:00 2001
-From: "Miguel A. Vico" <mvicomoya@nvidia.com>
-Date: Wed, 30 Mar 2016 15:44:09 +0200
-Subject: [PATCH 01/12] gl-renderer: Rename gl_renderer_create to
- gl_renderer_display_create
-X-NVConfidentiality: public
-
-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>
----
- libweston/compositor-drm.c | 12 ++++++------
- libweston/compositor-wayland.c | 12 ++++++------
- libweston/compositor-x11.c | 5 +++--
- libweston/gl-renderer.c | 4 ++--
- libweston/gl-renderer.h | 12 ++++++------
- 5 files changed, 23 insertions(+), 22 deletions(-)
-
-diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
-index 8319d7cf3ede..c6ec767489ee 100644
---- a/libweston/compositor-drm.c
-+++ b/libweston/compositor-drm.c
-@@ -1619,12 +1619,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 c223baa3db26..621e59ecac5a 100644
---- a/libweston/compositor-wayland.c
-+++ b/libweston/compositor-wayland.c
-@@ -2220,12 +2220,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 = 1;
-diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
-index 3e0d20fbb768..84747a052d10 100644
---- a/libweston/compositor-x11.c
-+++ b/libweston/compositor-x11.c
-@@ -1582,8 +1582,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 031576bcf997..9d5d65b03e46 100644
---- a/libweston/gl-renderer.c
-+++ b/libweston/gl-renderer.c
-@@ -2890,7 +2890,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)
- {
-@@ -3181,7 +3181,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 37d000fefb85..32ba1536b60e 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);
-
---
-2.10.2
-