diff options
Diffstat (limited to '0003-gl-renderer-Rename-attribs-param-of-gl_renderer-to-c.patch')
| -rw-r--r-- | 0003-gl-renderer-Rename-attribs-param-of-gl_renderer-to-c.patch | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/0003-gl-renderer-Rename-attribs-param-of-gl_renderer-to-c.patch b/0003-gl-renderer-Rename-attribs-param-of-gl_renderer-to-c.patch index 320e8f964339..e0e7703e7e07 100644 --- a/0003-gl-renderer-Rename-attribs-param-of-gl_renderer-to-c.patch +++ b/0003-gl-renderer-Rename-attribs-param-of-gl_renderer-to-c.patch @@ -1,4 +1,4 @@ -From f0598cde32ca1af3fecd71d8592f34e56f6bdae0 Mon Sep 17 00:00:00 2001 +From 31f40175f702c8799bd69d5d9612d90e247501f3 Mon Sep 17 00:00:00 2001 From: "Miguel A. Vico" <mvicomoya@nvidia.com> Date: Wed, 30 Mar 2016 15:23:49 +0200 Subject: [PATCH 03/11] gl-renderer: Rename <attribs> param of gl_renderer to @@ -13,16 +13,18 @@ to <config_attribs> 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/gl-renderer.c | 8 ++++---- - src/gl-renderer.h | 4 ++-- + libweston/gl-renderer.c | 8 ++++---- + libweston/gl-renderer.h | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) -diff --git a/src/gl-renderer.c b/src/gl-renderer.c -index 784cacbc2619..b0bee7f6a94f 100644 ---- a/src/gl-renderer.c -+++ b/src/gl-renderer.c -@@ -2550,7 +2550,7 @@ static int +diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c +index 0015268d210a..e11c22cf3f05 100644 +--- a/libweston/gl-renderer.c ++++ b/libweston/gl-renderer.c +@@ -2547,7 +2547,7 @@ static int gl_renderer_output_window_create(struct weston_output *output, EGLNativeWindowType window_for_legacy, void *window_for_platform, @@ -31,7 +33,7 @@ index 784cacbc2619..b0bee7f6a94f 100644 const EGLint *visual_id, int n_ids) { -@@ -2560,7 +2560,7 @@ gl_renderer_output_window_create(struct weston_output *output, +@@ -2557,7 +2557,7 @@ gl_renderer_output_window_create(struct weston_output *output, EGLConfig egl_config; int i; @@ -40,7 +42,7 @@ index 784cacbc2619..b0bee7f6a94f 100644 n_ids, &egl_config) == -1) { weston_log("failed to choose EGL config for output\n"); return -1; -@@ -2874,7 +2874,7 @@ platform_to_extension(EGLenum platform) +@@ -2891,7 +2891,7 @@ gl_renderer_create_pbuffer_surface(struct gl_renderer *gr) { static int gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, @@ -49,7 +51,7 @@ index 784cacbc2619..b0bee7f6a94f 100644 const EGLint *visual_id, int n_ids) { struct gl_renderer *gr; -@@ -2938,7 +2938,7 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, +@@ -2955,7 +2955,7 @@ gl_renderer_display_create(struct weston_compositor *ec, EGLenum platform, goto fail_with_error; } @@ -58,11 +60,11 @@ index 784cacbc2619..b0bee7f6a94f 100644 n_ids, &gr->egl_config) < 0) { weston_log("failed to choose EGL config\n"); goto fail_terminate; -diff --git a/src/gl-renderer.h b/src/gl-renderer.h -index ae9bf0f0aee2..d43131940f43 100644 ---- a/src/gl-renderer.h -+++ b/src/gl-renderer.h -@@ -78,7 +78,7 @@ struct gl_renderer_interface { +diff --git a/libweston/gl-renderer.h b/libweston/gl-renderer.h +index 5b3b68a8e4fa..9d6648680533 100644 +--- a/libweston/gl-renderer.h ++++ b/libweston/gl-renderer.h +@@ -63,7 +63,7 @@ struct gl_renderer_interface { int (*display_create)(struct weston_compositor *ec, EGLenum platform, void *native_window, @@ -71,7 +73,7 @@ index ae9bf0f0aee2..d43131940f43 100644 const EGLint *visual_id, const int n_ids); -@@ -87,7 +87,7 @@ struct gl_renderer_interface { +@@ -72,7 +72,7 @@ struct gl_renderer_interface { int (*output_window_create)(struct weston_output *output, EGLNativeWindowType window_for_legacy, void *window_for_platform, @@ -81,5 +83,5 @@ index ae9bf0f0aee2..d43131940f43 100644 const int n_ids); -- -2.8.3 +2.10.0 |