diff options
| author | mh0310.choi <mh0310.choi@samsung.com> | 2015-07-28 10:46:57 +0900 |
|---|---|---|
| committer | mh0310.choi <mh0310.choi@samsung.com> | 2015-07-28 13:08:12 +0900 |
| commit | 5e67a6f721eaedda61300baf0799199c7771ebd0 (patch) | |
| tree | 6cd50b52498aab50e79b966cdccc2a137db316d9 /boilerplate/cairo-boilerplate-evas-gl.c | |
| parent | d3aeffba37161d2b76b29c4ea13369bd67a47a8e (diff) | |
| download | cairo-submit/tizen_mobile/20150728.091912.tar.gz cairo-submit/tizen_mobile/20150728.091912.tar.bz2 cairo-submit/tizen_mobile/20150728.091912.zip | |
Cairo version Upgrade for Tizen3.0submit/tizen_tv/20150728.091927submit/tizen_mobile/20150728.091912submit/tizen_common/20150728.091859accepted/tizen/tv/20150729.011254accepted/tizen/mobile/20150729.011230
- from 1.12.14 to 1.14.2
Change-Id: I3b62d212041b337bbb926d579f9ce74f42a45c3b
Diffstat (limited to 'boilerplate/cairo-boilerplate-evas-gl.c')
| -rw-r--r--[-rwxr-xr-x] | boilerplate/cairo-boilerplate-evas-gl.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/boilerplate/cairo-boilerplate-evas-gl.c b/boilerplate/cairo-boilerplate-evas-gl.c index 151e6af29..0b98de80a 100755..100644 --- a/boilerplate/cairo-boilerplate-evas-gl.c +++ b/boilerplate/cairo-boilerplate-evas-gl.c @@ -32,7 +32,6 @@ */ #include "cairo-boilerplate-private.h" - #include <cairo-gl.h> #include <cairo-evas-gl.h> #include <Ecore_Evas.h> @@ -90,7 +89,13 @@ _cairo_boilerplate_evas_gl_create_surface (const char *name, ecore_init (); ecore_evas_init (); + +#ifdef HAVE_WAYLAND //Wayland (Tizen 3.0) + ee = ecore_evas_wayland_egl_new (NULL, 0, 0, 0, ceil (width), ceil (height), EINA_TRUE); +#else ee = ecore_evas_gl_x11_new (NULL, 0, 0, 0, ceil (width), ceil (height));; +#endif + canvas = ecore_evas_get (ee); gltc = xcalloc (1, sizeof (evas_gl_target_closure_t)); @@ -99,7 +104,7 @@ _cairo_boilerplate_evas_gl_create_surface (const char *name, gltc->evas_gl = evas_gl_new (canvas); gltc->evas_ctx = evas_gl_context_create (gltc->evas_gl, NULL); gltc->evas_api = evas_gl_api_get (gltc->evas_gl); - + gltc->device = cairo_evas_gl_device_create (gltc->evas_gl, gltc->evas_ctx); gltc->surface = surface = |