diff options
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.patch | 83 |
1 files changed, 36 insertions, 47 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 index 12cf967fdc4f..6f71a7ac89b7 100644 --- a/0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch +++ b/0004-gl-renderer-Add-platform_attribs-param-to-gl_rendere.patch @@ -1,4 +1,4 @@ -From 0e4bc3d227912df81c275ccddc48cae5b058d65c Mon Sep 17 00:00:00 2001 +From 4e02c69b513e5cb02451c794a9ed5091c74abc04 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/11] gl-renderer: Add <platform_attribs> param to @@ -12,20 +12,21 @@ 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> + +[aplattner@nvidia.com: rebased on top of Weston 1.12.0] --- - src/compositor-drm.c | 1 + - src/compositor-fbdev.c | 1 + - src/compositor-wayland.c | 1 + - src/compositor-x11.c | 2 +- - src/gl-renderer.c | 6 +++--- - src/gl-renderer.h | 1 + - 6 files changed, 8 insertions(+), 4 deletions(-) + 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/src/compositor-drm.c b/src/compositor-drm.c -index 20e6474511ef..dd545de1ccc0 100644 ---- a/src/compositor-drm.c -+++ b/src/compositor-drm.c -@@ -1580,6 +1580,7 @@ drm_backend_create_gl_renderer(struct drm_backend *b) +diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c +index 87cd7be22344..888881880e16 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, @@ -33,23 +34,11 @@ index 20e6474511ef..dd545de1ccc0 100644 gl_renderer->opaque_attribs, format, n_formats) < 0) { -diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c -index 21a24fd4c4e3..7a7c32915c8c 100644 ---- a/src/compositor-fbdev.c -+++ b/src/compositor-fbdev.c -@@ -787,6 +787,7 @@ fbdev_backend_create(struct weston_compositor *compositor, int *argc, char *argv - - if (gl_renderer->display_create(compositor, NO_EGL_PLATFORM, - EGL_DEFAULT_DISPLAY, -+ NULL, - gl_renderer->opaque_attribs, - NULL, 0) < 0) { - weston_log("gl_renderer_create failed.\n"); -diff --git a/src/compositor-wayland.c b/src/compositor-wayland.c -index 85e755a52d84..88992dbeec23 100644 ---- a/src/compositor-wayland.c -+++ b/src/compositor-wayland.c -@@ -2211,6 +2211,7 @@ wayland_backend_create(struct weston_compositor *compositor, +diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c +index b434700fa0ff..359a3c85624f 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, @@ -57,11 +46,11 @@ index 85e755a52d84..88992dbeec23 100644 gl_renderer->alpha_attribs, NULL, 0) < 0) { -diff --git a/src/compositor-x11.c b/src/compositor-x11.c -index 6b61cee6bbed..52b7a7e16cd7 100644 ---- a/src/compositor-x11.c -+++ b/src/compositor-x11.c -@@ -1558,7 +1558,7 @@ init_gl_renderer(struct x11_backend *b) +diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c +index 0664e220d10f..8b03274814dc 100644 +--- a/libweston/compositor-x11.c ++++ b/libweston/compositor-x11.c +@@ -1583,7 +1583,7 @@ init_gl_renderer(struct x11_backend *b) return -1; ret = gl_renderer->display_create(b->compositor, EGL_PLATFORM_X11_KHR, @@ -70,11 +59,11 @@ index 6b61cee6bbed..52b7a7e16cd7 100644 gl_renderer->opaque_attribs, NULL, 0); return ret; -diff --git a/src/gl-renderer.c b/src/gl-renderer.c -index b0bee7f6a94f..7f522055fac8 100644 ---- a/src/gl-renderer.c -+++ b/src/gl-renderer.c -@@ -2874,8 +2874,8 @@ platform_to_extension(EGLenum platform) +diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c +index e11c22cf3f05..729abd62c0d6 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, @@ -85,7 +74,7 @@ index b0bee7f6a94f..7f522055fac8 100644 { struct gl_renderer *gr; EGLint major, minor; -@@ -2917,7 +2917,7 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, +@@ -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, @@ -94,11 +83,11 @@ index b0bee7f6a94f..7f522055fac8 100644 } } -diff --git a/src/gl-renderer.h b/src/gl-renderer.h -index d43131940f43..f778cd9b6f69 100644 ---- a/src/gl-renderer.h -+++ b/src/gl-renderer.h -@@ -78,6 +78,7 @@ struct gl_renderer_interface { +diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h +index 9d6648680533..02f8011247db 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, @@ -107,5 +96,5 @@ index d43131940f43..f778cd9b6f69 100644 const EGLint *visual_id, const int n_ids); -- -2.8.3 +2.10.0 |