summarylogtreecommitdiffstats
path: root/0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch
diff options
context:
space:
mode:
authorMiguel A. Vico2017-02-27 16:17:02 -0800
committerMiguel A. Vico2017-02-27 16:34:57 -0800
commit0c13397cfb664feded35ae04f83dac78fb7f60bc (patch)
tree6fb7e205805359f0689c6172d5e8119f1c625a91 /0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch
parent0351b429af478ee4c2b90520bf793438c3526490 (diff)
downloadaur-0c13397cfb664feded35ae04f83dac78fb7f60bc.tar.gz
Update to weston 2.0.0
Some of the patches are no longer required as they were merged upstream. The rest were rebased on top of weston 2.0.0 and conflicts resolved. Signed-off-by: Miguel A. Vico <mvicomoya@nvidia.com>
Diffstat (limited to '0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch')
-rw-r--r--0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch98
1 files changed, 0 insertions, 98 deletions
diff --git a/0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch b/0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch
deleted file mode 100644
index 9e7097b0b3d..00000000000
--- a/0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From d8ff7f97e20b05ae5889a42590df5614845d1f7f Mon Sep 17 00:00:00 2001
-From: "Miguel A. Vico" <mvicomoya@nvidia.com>
-Date: Wed, 30 Mar 2016 15:17:01 +0200
-Subject: [PATCH 04/12] gl-renderer: Add <platform_attribs> param to
- gl_renderer_display_create
-X-NVConfidentiality: public
-
-In preparation for follow-on changes to support frame presentation
-through EGLDevice+EGLOutput, this change adds <platform_attribs>
-parameter to gl_renderer_display_create().
-
-Signed-off-by: Miguel A Vico Moya <mvicomoya@nvidia.com>
-Reviewed-by: Andy Ritger <aritger@nvidia.com>
-Reviewed-by: James Jones <jajones@nvidia.com>
----
- libweston/compositor-drm.c | 1 +
- libweston/compositor-wayland.c | 1 +
- libweston/compositor-x11.c | 2 +-
- libweston/gl-renderer.c | 6 +++---
- libweston/gl-renderer.h | 1 +
- 5 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c
-index d10734a6e777..df357c3c809b 100644
---- a/libweston/compositor-drm.c
-+++ b/libweston/compositor-drm.c
-@@ -1622,6 +1622,7 @@ drm_backend_create_gl_renderer(struct drm_backend *b)
- if (gl_renderer->display_create(b->compositor,
- EGL_PLATFORM_GBM_KHR,
- (void *)b->gbm,
-+ NULL,
- gl_renderer->opaque_attribs,
- format,
- n_formats) < 0) {
-diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c
-index 6370f6a2ecb3..7655f8d3e4c8 100644
---- a/libweston/compositor-wayland.c
-+++ b/libweston/compositor-wayland.c
-@@ -2223,6 +2223,7 @@ wayland_backend_create(struct weston_compositor *compositor,
- if (gl_renderer->display_create(compositor,
- EGL_PLATFORM_WAYLAND_KHR,
- b->parent.wl_display,
-+ NULL,
- gl_renderer->alpha_attribs,
- NULL,
- 0) < 0) {
-diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c
-index ef98f74bb9da..a8246b1ee221 100644
---- a/libweston/compositor-x11.c
-+++ b/libweston/compositor-x11.c
-@@ -1584,7 +1584,7 @@ init_gl_renderer(struct x11_backend *b)
- return -1;
-
- ret = gl_renderer->display_create(b->compositor, EGL_PLATFORM_X11_KHR,
-- (void *) b->dpy,
-+ (void *) b->dpy, NULL,
- gl_renderer->opaque_attribs, NULL, 0);
-
- return ret;
-diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c
-index bb5c079eed92..736394a53eed 100644
---- a/libweston/gl-renderer.c
-+++ b/libweston/gl-renderer.c
-@@ -2891,8 +2891,8 @@ gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) {
-
- static int
- gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform,
-- void *native_window, const EGLint *config_attribs,
-- const EGLint *visual_id, int n_ids)
-+ void *native_window, const EGLint *platform_attribs,
-+ const EGLint *config_attribs, const EGLint *visual_id, int n_ids)
- {
- struct gl_renderer *gr;
- EGLint major, minor;
-@@ -2934,7 +2934,7 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform,
- if (get_platform_display && platform) {
- gr->egl_display = get_platform_display(platform,
- native_window,
-- NULL);
-+ platform_attribs);
- }
- }
-
-diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h
-index 1835d2536670..b47ea07feaf0 100644
---- a/libweston/gl-renderer.h
-+++ b/libweston/gl-renderer.h
-@@ -63,6 +63,7 @@ struct gl_renderer_interface {
- int (*display_create)(struct weston_compositor *ec,
- EGLenum platform,
- void *native_window,
-+ const EGLint *platform_attribs,
- const EGLint *config_attribs,
- const EGLint *visual_id,
- const int n_ids);
---
-2.10.2
-