diff options
author | Lauren Post <lauren.post@freescale.com> | 2014-06-04 17:23:24 -0500 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2014-06-05 13:50:38 -0300 |
commit | 49aefc25c6c63c634090e6b923e0fd89871ebf00 (patch) | |
tree | 081a0512f9d3750a58d599085dd97887ef4f3e2a | |
parent | f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b (diff) | |
download | meta-fsl-arm-49aefc25c6c63c634090e6b923e0fd89871ebf00.tar.gz |
weston: Upgrade patches to 1.5 with GPU integration
This rework the patches for them to apply against the Weston 1.5
release.
Change-Id: I99b08011b8e76ac3f4a955e5f48e6f0093326cad
Signed-off-by: Lauren Post <lauren.post@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-graphics/wayland/weston/0001-ENGR00314805-1-Add-Vivante-EGL-support.patch (renamed from recipes-graphics/wayland/weston/0001-Add-support-for-Vivante-FBDEV-EGL.patch) | 55 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston/0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch (renamed from recipes-graphics/wayland/weston/0002-weston-Add-Vivante-2D-compositor-support.patch) | 131 | ||||
-rw-r--r-- | recipes-graphics/wayland/weston_%.bbappend | 7 |
3 files changed, 93 insertions, 100 deletions
diff --git a/recipes-graphics/wayland/weston/0001-Add-support-for-Vivante-FBDEV-EGL.patch b/recipes-graphics/wayland/weston/0001-ENGR00314805-1-Add-Vivante-EGL-support.patch index 6c8dfe9..e946fe4 100644 --- a/recipes-graphics/wayland/weston/0001-Add-support-for-Vivante-FBDEV-EGL.patch +++ b/recipes-graphics/wayland/weston/0001-ENGR00314805-1-Add-Vivante-EGL-support.patch | |||
@@ -1,17 +1,20 @@ | |||
1 | From bc8f870072b134ffc9b8047a53835b7b6f714d5d Mon Sep 17 00:00:00 2001 | 1 | From 0d24f9872fc5bbbb07ae55f1107ba0f5060fca8a Mon Sep 17 00:00:00 2001 |
2 | From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> | 2 | From: Yong Gan <b45748@freescale.com> |
3 | Date: Tue, 11 Mar 2014 17:35:52 -0500 | 3 | Date: Thu, 22 May 2014 15:25:42 +0800 |
4 | Subject: [PATCH] Add support for Vivante FBDEV EGL | 4 | Subject: [PATCH 1/3] ENGR00314805-1 Add Vivante EGL support |
5 | |||
6 | Add Vivante EGL compositor support. | ||
5 | 7 | ||
6 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
7 | 9 | ||
8 | Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> | 10 | [DATE]05-22-2014 |
11 | Signed-off-by Yong Gan <B45748@freescale.com> | ||
9 | --- | 12 | --- |
10 | src/compositor-fbdev.c | 20 +++++++++++++++++--- | 13 | src/compositor-fbdev.c | 23 +++++++++++++++++++---- |
11 | 1 file changed, 17 insertions(+), 3 deletions(-) | 14 | 1 file changed, 19 insertions(+), 4 deletions(-) |
12 | 15 | ||
13 | diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c | 16 | diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c |
14 | index 0d96269..ada0019 100644 | 17 | index e703e0e..3db1d17 100644 |
15 | --- a/src/compositor-fbdev.c | 18 | --- a/src/compositor-fbdev.c |
16 | +++ b/src/compositor-fbdev.c | 19 | +++ b/src/compositor-fbdev.c |
17 | @@ -53,6 +53,7 @@ struct fbdev_compositor { | 20 | @@ -53,6 +53,7 @@ struct fbdev_compositor { |
@@ -32,38 +35,40 @@ index 0d96269..ada0019 100644 | |||
32 | }; | 35 | }; |
33 | 36 | ||
34 | struct fbdev_parameters { | 37 | struct fbdev_parameters { |
35 | @@ -626,9 +630,13 @@ fbdev_output_create(struct fbdev_compositor *compositor, | 38 | @@ -627,10 +631,15 @@ fbdev_output_create(struct fbdev_compositor *compositor, |
36 | if (pixman_renderer_output_create(&output->base) < 0) | ||
37 | goto out_shadow_surface; | 39 | goto out_shadow_surface; |
38 | } else { | 40 | } else { |
39 | - setenv("HYBRIS_EGLPLATFORM", "wayland", 1); | 41 | setenv("HYBRIS_EGLPLATFORM", "wayland", 1); |
40 | + output->window = fbCreateWindow(compositor->display, -1, -1, 0, 0); | 42 | + output->window = fbCreateWindow(compositor->display, -1, -1, 0, 0); |
41 | + if (output->window == NULL) { | 43 | + if (output->window == NULL) { |
42 | + fprintf(stderr, "failed to create window\n"); | 44 | + fprintf(stderr, "failed to create window\n"); |
43 | + return 0; | 45 | + return 0; |
44 | + } | 46 | + } |
45 | if (gl_renderer->output_create(&output->base, | 47 | if (gl_renderer->output_create(&output->base, |
46 | - (EGLNativeWindowType)NULL) < 0) { | 48 | - (EGLNativeWindowType)NULL, |
47 | + (EGLNativeWindowType)output->window) < 0) { | 49 | - gl_renderer->opaque_attribs, |
50 | - NULL) < 0) { | ||
51 | + (EGLNativeWindowType)output->window, | ||
52 | + gl_renderer->opaque_attribs, | ||
53 | + NULL) < 0) { | ||
48 | weston_log("gl_renderer_output_create failed.\n"); | 54 | weston_log("gl_renderer_output_create failed.\n"); |
49 | goto out_shadow_surface; | 55 | goto out_shadow_surface; |
50 | } | 56 | } |
51 | @@ -920,8 +928,14 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], | 57 | @@ -923,7 +932,13 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], |
52 | weston_log("could not load gl renderer\n"); | ||
53 | goto out_launcher; | 58 | goto out_launcher; |
54 | } | 59 | } |
55 | + | 60 | |
61 | - if (gl_renderer->create(&compositor->base, EGL_DEFAULT_DISPLAY, | ||
56 | + compositor->display = fbGetDisplay(compositor->base.wl_display); | 62 | + compositor->display = fbGetDisplay(compositor->base.wl_display); |
57 | + if (compositor->display == NULL) { | 63 | + if (compositor->display == NULL) { |
58 | + weston_log("fbGetDisplay failed.\n"); | 64 | + weston_log("fbGetDisplay failed.\n"); |
59 | + goto out_launcher; | 65 | + goto out_launcher; |
60 | + } | 66 | + } |
61 | 67 | + | |
62 | - if (gl_renderer->create(&compositor->base, EGL_DEFAULT_DISPLAY, | ||
63 | + if (gl_renderer->create(&compositor->base, compositor->display, | 68 | + if (gl_renderer->create(&compositor->base, compositor->display, |
64 | gl_renderer->opaque_attribs, | 69 | gl_renderer->opaque_attribs, |
65 | NULL) < 0) { | 70 | NULL) < 0) { |
66 | weston_log("gl_renderer_create failed.\n"); | 71 | weston_log("gl_renderer_create failed.\n"); |
67 | -- | 72 | -- |
68 | 1.8.1.2 | 73 | 1.7.9.5 |
69 | 74 | ||
diff --git a/recipes-graphics/wayland/weston/0002-weston-Add-Vivante-2D-compositor-support.patch b/recipes-graphics/wayland/weston/0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch index f60a208..58b5966 100644 --- a/recipes-graphics/wayland/weston/0002-weston-Add-Vivante-2D-compositor-support.patch +++ b/recipes-graphics/wayland/weston/0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch | |||
@@ -1,59 +1,54 @@ | |||
1 | From c5fa88cb08477384430d2ab1123319c9d5dfb31c Mon Sep 17 00:00:00 2001 | 1 | From 2a24c62ef00d1b08974bd8f07e277695ac2911fa Mon Sep 17 00:00:00 2001 |
2 | From: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> | 2 | From: Yong Gan <b45748@freescale.com> |
3 | Date: Mon, 24 Mar 2014 07:30:25 -0500 | 3 | Date: Thu, 22 May 2014 15:26:31 +0800 |
4 | Subject: [PATCH 2/2] weston : Add Vivante 2D compositor support | 4 | Subject: [PATCH 2/3] ENGR00314805-2 Add Vivante GAL2D support |
5 | |||
6 | Add Vivante GAL2D compositor support. | ||
5 | 7 | ||
6 | Upstream-Status: Pending | 8 | Upstream-Status: Pending |
7 | 9 | ||
8 | Signed-off-by: Prabhu Sundararaj <prabhu.sundararaj@freescale.com> | 10 | [DATE]05-22-2014 |
11 | Signed-off-by Yong Gan <B45748@freescale.com> | ||
9 | --- | 12 | --- |
10 | src/Makefile.am | 14 + | 13 | Makefile.am | 13 + |
11 | src/compositor-fbdev.c | 111 ++++- | 14 | src/compositor-fbdev.c | 110 ++++- |
12 | src/gal2d-renderer.c | 1186 ++++++++++++++++++++++++++++++++++++++++++++++++ | 15 | src/gal2d-renderer.c | 1187 ++++++++++++++++++++++++++++++++++++++++++++++++ |
13 | src/gal2d-renderer.h | 43 ++ | 16 | src/gal2d-renderer.h | 41 ++ |
14 | 4 files changed, 1340 insertions(+), 14 deletions(-) | 17 | 4 files changed, 1337 insertions(+), 14 deletions(-) |
15 | create mode 100644 src/gal2d-renderer.c | 18 | create mode 100644 src/gal2d-renderer.c |
16 | create mode 100644 src/gal2d-renderer.h | 19 | create mode 100644 src/gal2d-renderer.h |
17 | 20 | ||
18 | diff --git a/src/Makefile.am b/src/Makefile.am | 21 | diff --git a/Makefile.am b/Makefile.am |
19 | index 446639c..ef6abd6 100644 | 22 | index 343adc6..2bccfe9 100644 |
20 | --- a/src/Makefile.am | 23 | --- a/Makefile.am |
21 | +++ b/src/Makefile.am | 24 | +++ b/Makefile.am |
22 | @@ -112,6 +112,7 @@ module_LTLIBRARIES = \ | 25 | @@ -162,6 +162,19 @@ gl_renderer_la_SOURCES = \ |
23 | $(cms_static) \ | 26 | src/gl-renderer.c \ |
24 | $(cms_colord) \ | 27 | src/vertex-clipping.c \ |
25 | $(gl_renderer) \ | 28 | src/vertex-clipping.h |
26 | + $(gal2d_renderer) \ | 29 | + |
27 | $(x11_backend) \ | 30 | +module_LTLIBRARIES += gal2d-renderer.la |
28 | $(drm_backend) \ | ||
29 | $(wayland_backend) \ | ||
30 | @@ -138,6 +139,19 @@ gl_renderer_la_SOURCES = \ | ||
31 | gl-renderer.c \ | ||
32 | vertex-clipping.c \ | ||
33 | vertex-clipping.h | ||
34 | + | ||
35 | +gal2d_renderer = gal2d-renderer.la | ||
36 | +gal2d_renderer_la_LDFLAGS = -module -avoid-version | 31 | +gal2d_renderer_la_LDFLAGS = -module -avoid-version |
37 | +gal2d_renderer_la_LIBADD = $(COMPOSITOR_LIBS) $(EGL_LIBS) | 32 | +gal2d_renderer_la_LIBADD = $(COMPOSITOR_LIBS) $(EGL_LIBS) |
38 | +gal2d_renderer_la_CFLAGS = \ | 33 | +gal2d_renderer_la_CFLAGS = \ |
39 | + $(COMPOSITOR_CFLAGS) \ | 34 | + $(COMPOSITOR_CFLAGS) \ |
40 | + $(EGL_CFLAGS) \ | 35 | + $(EGL_CFLAGS) \ |
41 | + $(GCC_CFLAGS) | 36 | + $(GCC_CFLAGS) |
42 | +gal2d_renderer_la_SOURCES = \ | 37 | +gal2d_renderer_la_SOURCES = \ |
43 | + gal2d-renderer.h \ | 38 | + src/gal2d-renderer.h \ |
44 | + gal2d-renderer.c \ | 39 | + src/gal2d-renderer.c \ |
45 | + vertex-clipping.c \ | 40 | + src/vertex-clipping.c \ |
46 | + vertex-clipping.h | 41 | + src/vertex-clipping.h |
47 | endif | 42 | endif |
48 | 43 | ||
49 | if ENABLE_X11_COMPOSITOR | 44 | if ENABLE_X11_COMPOSITOR |
50 | diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c | 45 | diff --git a/src/compositor-fbdev.c b/src/compositor-fbdev.c |
51 | index 72939b4..28f1fca 100644 | 46 | index 3db1d17..a3d32e5 100644 |
52 | --- a/src/compositor-fbdev.c | 47 | --- a/src/compositor-fbdev.c |
53 | +++ b/src/compositor-fbdev.c | 48 | +++ b/src/compositor-fbdev.c |
54 | @@ -44,6 +44,7 @@ | 49 | @@ -44,6 +44,7 @@ |
55 | #include "pixman-renderer.h" | 50 | #include "pixman-renderer.h" |
56 | #include "udev-seat.h" | 51 | #include "udev-input.h" |
57 | #include "gl-renderer.h" | 52 | #include "gl-renderer.h" |
58 | +#include "gal2d-renderer.h" | 53 | +#include "gal2d-renderer.h" |
59 | 54 | ||
@@ -65,7 +60,7 @@ index 72939b4..28f1fca 100644 | |||
65 | int use_pixman; | 60 | int use_pixman; |
66 | + int use_gal2d; | 61 | + int use_gal2d; |
67 | struct wl_listener session_listener; | 62 | struct wl_listener session_listener; |
68 | NativeDisplayType display; | 63 | EGLNativeDisplayType display; |
69 | }; | 64 | }; |
70 | @@ -97,9 +99,11 @@ struct fbdev_parameters { | 65 | @@ -97,9 +99,11 @@ struct fbdev_parameters { |
71 | int tty; | 66 | int tty; |
@@ -107,28 +102,29 @@ index 72939b4..28f1fca 100644 | |||
107 | output->fb_info.height_mm, | 102 | output->fb_info.height_mm, |
108 | WL_OUTPUT_TRANSFORM_NORMAL, | 103 | WL_OUTPUT_TRANSFORM_NORMAL, |
109 | 1); | 104 | 1); |
110 | @@ -629,14 +634,40 @@ fbdev_output_create(struct fbdev_compositor *compositor, | 105 | @@ -629,8 +634,33 @@ fbdev_output_create(struct fbdev_compositor *compositor, |
111 | if (compositor->use_pixman) { | 106 | if (compositor->use_pixman) { |
112 | if (pixman_renderer_output_create(&output->base) < 0) | 107 | if (pixman_renderer_output_create(&output->base) < 0) |
113 | goto out_shadow_surface; | 108 | goto out_shadow_surface; |
114 | - } else { | 109 | - } else { |
110 | - setenv("HYBRIS_EGLPLATFORM", "wayland", 1); | ||
115 | + } | 111 | + } |
116 | + else if(compositor->use_gal2d) { | 112 | + else if(compositor->use_gal2d) { |
117 | + | 113 | + |
118 | + char* fbenv = getenv("FB_FRAMEBUFFER_0"); | 114 | + char* fbenv = getenv("FB_FRAMEBUFFER_0"); |
119 | + setenv("FB_FRAMEBUFFER_0", device, 1); | 115 | + setenv("FB_FRAMEBUFFER_0", device, 1); |
120 | + output->display = fbGetDisplay(compositor->base.wl_display); | 116 | + output->display = fbGetDisplay(compositor->base.wl_display); |
121 | + if (output->display == NULL) { | 117 | + if (output->display == NULL) { |
122 | + fprintf(stderr, "failed to get display\n"); | 118 | + fprintf(stderr, "failed to get display\n"); |
123 | + return 0; | 119 | + return 0; |
124 | + } | 120 | + } |
125 | + | 121 | + |
126 | + output->window = fbCreateWindow(output->display, -1, -1, 0, 0); | 122 | + output->window = fbCreateWindow(output->display, -1, -1, 0, 0); |
127 | + if (output->window == NULL) { | 123 | + if (output->window == NULL) { |
128 | + fprintf(stderr, "failed to create window\n"); | 124 | + fprintf(stderr, "failed to create window\n"); |
129 | + return 0; | 125 | + return 0; |
130 | + } | 126 | + } |
131 | + setenv("FB_FRAMEBUFFER_0", fbenv, 1); | 127 | + setenv("FB_FRAMEBUFFER_0", fbenv, 1); |
132 | + | 128 | + |
133 | + if (gal2d_renderer->output_create(&output->base, | 129 | + if (gal2d_renderer->output_create(&output->base, |
134 | + output->display, | 130 | + output->display, |
@@ -140,17 +136,9 @@ index 72939b4..28f1fca 100644 | |||
140 | + } | 136 | + } |
141 | + else { | 137 | + else { |
142 | output->window = fbCreateWindow(compositor->display, -1, -1, 0, 0); | 138 | output->window = fbCreateWindow(compositor->display, -1, -1, 0, 0); |
143 | if (output->window == NULL) { | 139 | if (output->window == NULL) { |
144 | fprintf(stderr, "failed to create window\n"); | 140 | fprintf(stderr, "failed to create window\n"); |
145 | return 0; | 141 | @@ -698,7 +728,11 @@ fbdev_output_destroy(struct weston_output *base) |
146 | } | ||
147 | if (gl_renderer->output_create(&output->base, | ||
148 | - (EGLNativeWindowType)output->window) < 0) { | ||
149 | + (NativeWindowType)output->window) < 0) { | ||
150 | weston_log("gl_renderer_output_create failed.\n"); | ||
151 | goto out_shadow_surface; | ||
152 | } | ||
153 | @@ -695,7 +726,11 @@ fbdev_output_destroy(struct weston_output *base) | ||
154 | free(output->shadow_buf); | 142 | free(output->shadow_buf); |
155 | output->shadow_buf = NULL; | 143 | output->shadow_buf = NULL; |
156 | } | 144 | } |
@@ -163,7 +151,7 @@ index 72939b4..28f1fca 100644 | |||
163 | gl_renderer->output_destroy(base); | 151 | gl_renderer->output_destroy(base); |
164 | } | 152 | } |
165 | 153 | ||
166 | @@ -758,7 +793,7 @@ fbdev_output_reenable(struct fbdev_compositor *compositor, | 154 | @@ -761,7 +795,7 @@ fbdev_output_reenable(struct fbdev_compositor *compositor, |
167 | * are re-initialised. */ | 155 | * are re-initialised. */ |
168 | device = output->device; | 156 | device = output->device; |
169 | fbdev_output_destroy(base); | 157 | fbdev_output_destroy(base); |
@@ -172,7 +160,7 @@ index 72939b4..28f1fca 100644 | |||
172 | 160 | ||
173 | return 0; | 161 | return 0; |
174 | } | 162 | } |
175 | @@ -911,7 +946,10 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], | 163 | @@ -914,7 +948,10 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], |
176 | compositor->base.restore = fbdev_restore; | 164 | compositor->base.restore = fbdev_restore; |
177 | 165 | ||
178 | compositor->prev_state = WESTON_COMPOSITOR_ACTIVE; | 166 | compositor->prev_state = WESTON_COMPOSITOR_ACTIVE; |
@@ -184,7 +172,7 @@ index 72939b4..28f1fca 100644 | |||
184 | 172 | ||
185 | for (key = KEY_F1; key < KEY_F9; key++) | 173 | for (key = KEY_F1; key < KEY_F9; key++) |
186 | weston_compositor_add_key_binding(&compositor->base, key, | 174 | weston_compositor_add_key_binding(&compositor->base, key, |
187 | @@ -921,7 +959,50 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], | 175 | @@ -924,7 +961,50 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], |
188 | if (compositor->use_pixman) { | 176 | if (compositor->use_pixman) { |
189 | if (pixman_renderer_init(&compositor->base) < 0) | 177 | if (pixman_renderer_init(&compositor->base) < 0) |
190 | goto out_launcher; | 178 | goto out_launcher; |
@@ -236,7 +224,7 @@ index 72939b4..28f1fca 100644 | |||
236 | gl_renderer = weston_load_module("gl-renderer.so", | 224 | gl_renderer = weston_load_module("gl-renderer.so", |
237 | "gl_renderer_interface"); | 225 | "gl_renderer_interface"); |
238 | if (!gl_renderer) { | 226 | if (!gl_renderer) { |
239 | @@ -942,9 +1023,9 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], | 227 | @@ -945,9 +1025,9 @@ fbdev_compositor_create(struct wl_display *display, int *argc, char *argv[], |
240 | goto out_launcher; | 228 | goto out_launcher; |
241 | } | 229 | } |
242 | } | 230 | } |
@@ -249,7 +237,7 @@ index 72939b4..28f1fca 100644 | |||
249 | 237 | ||
250 | udev_input_init(&compositor->input, &compositor->base, compositor->udev, seat_id); | 238 | udev_input_init(&compositor->input, &compositor->base, compositor->udev, seat_id); |
251 | 239 | ||
252 | @@ -977,13 +1058,15 @@ backend_init(struct wl_display *display, int *argc, char *argv[], | 240 | @@ -980,13 +1060,15 @@ backend_init(struct wl_display *display, int *argc, char *argv[], |
253 | struct fbdev_parameters param = { | 241 | struct fbdev_parameters param = { |
254 | .tty = 0, /* default to current tty */ | 242 | .tty = 0, /* default to current tty */ |
255 | .device = "/dev/fb0", /* default frame buffer */ | 243 | .device = "/dev/fb0", /* default frame buffer */ |
@@ -269,10 +257,10 @@ index 72939b4..28f1fca 100644 | |||
269 | parse_options(fbdev_options, ARRAY_LENGTH(fbdev_options), argc, argv); | 257 | parse_options(fbdev_options, ARRAY_LENGTH(fbdev_options), argc, argv); |
270 | diff --git a/src/gal2d-renderer.c b/src/gal2d-renderer.c | 258 | diff --git a/src/gal2d-renderer.c b/src/gal2d-renderer.c |
271 | new file mode 100644 | 259 | new file mode 100644 |
272 | index 0000000..be7af3c | 260 | index 0000000..c651573 |
273 | --- /dev/null | 261 | --- /dev/null |
274 | +++ b/src/gal2d-renderer.c | 262 | +++ b/src/gal2d-renderer.c |
275 | @@ -0,0 +1,1186 @@ | 263 | @@ -0,0 +1,1187 @@ |
276 | +/* | 264 | +/* |
277 | + * Copyright (c) 2014 Freescale Semiconductor, Inc. | 265 | + * Copyright (c) 2014 Freescale Semiconductor, Inc. |
278 | + * Copyright © 2012 Intel Corporation | 266 | + * Copyright © 2012 Intel Corporation |
@@ -1228,7 +1216,8 @@ index 0000000..be7af3c | |||
1228 | + wl_list_remove(&gs->renderer_destroy_listener.link); | 1216 | + wl_list_remove(&gs->renderer_destroy_listener.link); |
1229 | + if(gs->surface) | 1217 | + if(gs->surface) |
1230 | + gs->surface->renderer_state = NULL; | 1218 | + gs->surface->renderer_state = NULL; |
1231 | + | 1219 | + |
1220 | + weston_buffer_reference(&gs->buffer_ref, NULL); | ||
1232 | + free(gs); | 1221 | + free(gs); |
1233 | +} | 1222 | +} |
1234 | + | 1223 | + |
@@ -1461,10 +1450,10 @@ index 0000000..be7af3c | |||
1461 | +}; | 1450 | +}; |
1462 | diff --git a/src/gal2d-renderer.h b/src/gal2d-renderer.h | 1451 | diff --git a/src/gal2d-renderer.h b/src/gal2d-renderer.h |
1463 | new file mode 100644 | 1452 | new file mode 100644 |
1464 | index 0000000..ebffec1 | 1453 | index 0000000..3b89f73 |
1465 | --- /dev/null | 1454 | --- /dev/null |
1466 | +++ b/src/gal2d-renderer.h | 1455 | +++ b/src/gal2d-renderer.h |
1467 | @@ -0,0 +1,43 @@ | 1456 | @@ -0,0 +1,41 @@ |
1468 | +/* | 1457 | +/* |
1469 | + * Copyright (c) 2014 Freescale Semiconductor, Inc. | 1458 | + * Copyright (c) 2014 Freescale Semiconductor, Inc. |
1470 | + * Copyright © 2013 Vasily Khoruzhick <anarsoul@gmail.com> | 1459 | + * Copyright © 2013 Vasily Khoruzhick <anarsoul@gmail.com> |
@@ -1505,9 +1494,7 @@ index 0000000..ebffec1 | |||
1505 | + void (*output_destroy)(struct weston_output *output); | 1494 | + void (*output_destroy)(struct weston_output *output); |
1506 | +}; | 1495 | +}; |
1507 | + | 1496 | + |
1508 | +struct gal2d_renderer_interface gal2d_renderer_interface; | ||
1509 | + | ||
1510 | +#endif | 1497 | +#endif |
1511 | -- | 1498 | -- |
1512 | 1.9.0 | 1499 | 1.7.9.5 |
1513 | 1500 | ||
diff --git a/recipes-graphics/wayland/weston_%.bbappend b/recipes-graphics/wayland/weston_%.bbappend index 0576b37..51af104 100644 --- a/recipes-graphics/wayland/weston_%.bbappend +++ b/recipes-graphics/wayland/weston_%.bbappend | |||
@@ -1,7 +1,7 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | 2 | ||
3 | SRC_URI += "file://0001-Add-support-for-Vivante-FBDEV-EGL.patch \ | 3 | SRC_URI += "file://0001-ENGR00314805-1-Add-Vivante-EGL-support.patch \ |
4 | file://0002-weston-Add-Vivante-2D-compositor-support.patch " | 4 | file://0002-ENGR00314805-2-Add-Vivante-GAL2D-support.patch" |
5 | 5 | ||
6 | PACKAGECONFIG_mx6 = "fbdev egl cairo-glesv2" | 6 | PACKAGECONFIG_mx6 = "fbdev egl cairo-glesv2" |
7 | 7 | ||
@@ -17,5 +17,6 @@ EXTRA_OEMAKE_append_mx6 = " \ | |||
17 | FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \ | 17 | FB_COMPOSITOR_CFLAGS="-DLINUX=1 -DEGL_API_FB -DEGL_API_WL" \ |
18 | FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \ | 18 | FB_COMPOSITOR_LIBS="-lGLESv2 -lEGL -lwayland-server -lxkbcommon" \ |
19 | SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \ | 19 | SIMPLE_EGL_CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \ |
20 | CLIENT_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \ | 20 | EGL_TESTS_CFLAGS="-DLINUX -DEGL_API_FB -DEGL_API_WL" \ |
21 | CLIENT_CFLAGS="-I ${STAGING_INCDIR}/cairo -I ${STAGING_INCDIR}/pixman-1 -DLINUX -DEGL_API_FB -DEGL_API_WL" \ | ||
21 | " | 22 | " |