summarylogtreecommitdiffstats
path: root/0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch
diff options
context:
space:
mode:
authorAaron Plattner2016-09-21 10:32:55 -0700
committerAaron Plattner2016-09-21 11:17:26 -0700
commit41d80de186af84ee0c026369166eceadb3be3327 (patch)
treed45a11a563b7bbd174e4ad326f605f260eb46de0 /0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch
parent527fba43a5628b8e2697ff253b162622e321b201 (diff)
downloadaur-41d80de186af84ee0c026369166eceadb3be3327.tar.gz
Update to Weston 1.12.0
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.patch84
1 files changed, 36 insertions, 48 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
index 6a11a96238e..9d3ee036339 100644
--- a/0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch
+++ b/0001-gl-renderer-Rename-gl_renderer_create-to-gl_renderer.patch
@@ -1,4 +1,4 @@
-From 986ecf2624930070e2d89dfe68459cd893179ca2 Mon Sep 17 00:00:00 2001
+From 1f96676539f06d5b92bccf98a1d388cad0bf0c41 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/11] gl-renderer: Rename gl_renderer_create to
@@ -11,20 +11,21 @@ what the function does.
Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
Reviewed-by: James Jones <jajones@nvidia.com>
+
+[aplattner@nvidia.com: rebased on top of Weston 1.12.0]
---
- src/compositor-drm.c | 2 +-
- src/compositor-fbdev.c | 2 +-
- src/compositor-wayland.c | 2 +-
- src/compositor-x11.c | 5 +++--
- src/gl-renderer.c | 4 ++--
- src/gl-renderer.h | 2 +-
- 6 files changed, 9 insertions(+), 8 deletions(-)
+ libweston/compositor-drm.c | 2 +-
+ libweston/compositor-wayland.c | 2 +-
+ libweston/compositor-x11.c | 5 +++--
+ libweston/gl-renderer.c | 4 ++--
+ libweston/gl-renderer.h | 2 +-
+ 5 files changed, 8 insertions(+), 7 deletions(-)
-diff --git a/src/compositor-drm.c b/src/compositor-drm.c
-index 893877d946ff..0e217e075713 100644
---- a/src/compositor-drm.c
-+++ b/src/compositor-drm.c
-@@ -1577,7 +1577,7 @@ drm_backend_create_gl_renderer(struct drm_backend *b)
+diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
+index 8319d7cf3ede..4046c8d6435c 100644
+--- a/libweston/compositor-drm.c
++++ b/libweston/compositor-drm.c
+@@ -1619,7 +1619,7 @@ drm_backend_create_gl_renderer(struct drm_backend *b)
if (format[1])
n_formats = 3;
@@ -33,24 +34,11 @@ index 893877d946ff..0e217e075713 100644
EGL_PLATFORM_GBM_KHR,
(void *)b->gbm,
gl_renderer->opaque_attribs,
-diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c
-index ee762e312c59..c6ffcd7e8696 100644
---- a/src/compositor-fbdev.c
-+++ b/src/compositor-fbdev.c
-@@ -785,7 +785,7 @@ fbdev_backend_create(struct weston_compositor *compositor, int *argc, char *argv
- goto out_launcher;
- }
-
-- if (gl_renderer->create(compositor, NO_EGL_PLATFORM,
-+ if (gl_renderer->display_create(compositor, NO_EGL_PLATFORM,
- EGL_DEFAULT_DISPLAY,
- gl_renderer->opaque_attribs,
- NULL, 0) < 0) {
-diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c
-index fe8b082b43fd..ba99b2af7f9c 100644
---- a/src/compositor-wayland.c
-+++ b/src/compositor-wayland.c
-@@ -2208,7 +2208,7 @@ wayland_backend_create(struct weston_compositor *compositor,
+diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
+index c223baa3db26..1a9db60cd644 100644
+--- a/libweston/compositor-wayland.c
++++ b/libweston/compositor-wayland.c
+@@ -2220,7 +2220,7 @@ wayland_backend_create(struct weston_compositor *compositor,
}
if (!b->use_pixman) {
@@ -59,11 +47,11 @@ index fe8b082b43fd..ba99b2af7f9c 100644
EGL_PLATFORM_WAYLAND_KHR,
b->parent.wl_display,
gl_renderer->alpha_attribs,
-diff --git a/src/compositor-x11.c b/src/compositor-x11.c
-index 629b5f39a217..78b9c62f873b 100644
---- a/src/compositor-x11.c
-+++ b/src/compositor-x11.c
-@@ -1557,8 +1557,9 @@ init_gl_renderer(struct x11_backend *b)
+diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
+index 3e0d20fbb768..97e151b27b71 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;
@@ -75,11 +63,11 @@ index 629b5f39a217..78b9c62f873b 100644
return ret;
}
-diff --git a/src/gl-renderer.c b/src/gl-renderer.c
-index 23c0cd722df8..197e5c2a3123 100644
---- a/src/gl-renderer.c
-+++ b/src/gl-renderer.c
-@@ -2873,7 +2873,7 @@ platform_to_extension(EGLenum platform)
+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
@@ -88,7 +76,7 @@ index 23c0cd722df8..197e5c2a3123 100644
void *native_window, const EGLint *attribs,
const EGLint *visual_id, int n_ids)
{
-@@ -3147,7 +3147,7 @@ WL_EXPORT struct gl_renderer_interface gl_renderer_interface = {
+@@ -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,
@@ -97,11 +85,11 @@ index 23c0cd722df8..197e5c2a3123 100644
.display = gl_renderer_display,
.output_create = gl_renderer_output_create,
.output_destroy = gl_renderer_output_destroy,
-diff --git a/src/gl-renderer.h b/src/gl-renderer.h
-index 71f6b46e49e1..cd67a890aae9 100644
---- a/src/gl-renderer.h
-+++ b/src/gl-renderer.h
-@@ -75,7 +75,7 @@ struct gl_renderer_interface {
+diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h
+index 37d000fefb85..71d5aab51c76 100644
+--- a/libweston/gl-renderer.h
++++ b/libweston/gl-renderer.h
+@@ -60,7 +60,7 @@ struct gl_renderer_interface {
const EGLint *opaque_attribs;
const EGLint *alpha_attribs;
@@ -111,5 +99,5 @@ index 71f6b46e49e1..cd67a890aae9 100644
void *native_window,
const EGLint *attribs,
--
-2.8.3
+2.10.0