]>
Commit | Line | Data |
---|---|---|
6af42324 JB |
1 | --- efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_engine.c.orig 2013-11-24 05:18:45.000000000 +0100 |
2 | +++ efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_engine.c 2013-12-07 12:52:11.209362982 +0100 | |
3 | @@ -128,8 +128,6 @@ | |
4 | /* external variables */ | |
5 | int _evas_engine_wl_egl_log_dom = -1; | |
6 | ||
7 | -#ifdef GL_GLES | |
8 | - | |
9 | # ifndef EGL_NATIVE_PIXMAP_KHR | |
10 | # define EGL_NATIVE_PIXMAP_KHR 0x30b0 | |
11 | # endif | |
12 | @@ -146,8 +144,6 @@ | |
13 | unsigned int (*glsym_eglUnmapImageSEC) (void *a, void *b, int c) = NULL; | |
14 | unsigned int (*glsym_eglSwapBuffersWithDamage) (EGLDisplay a, void *b, const EGLint *d, EGLint c) = NULL; | |
15 | ||
16 | -#endif | |
17 | - | |
18 | /* local functions */ | |
19 | static Eina_Bool | |
20 | evgl_init(Render_Engine *re) | |
21 | --- efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_engine.h.orig 2013-11-04 12:58:09.000000000 +0100 | |
22 | +++ efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_engine.h 2013-12-07 15:04:14.622363802 +0100 | |
23 | @@ -6,8 +6,8 @@ | |
24 | /* NB: This already includes wayland-client.h */ | |
25 | # include <wayland-egl.h> | |
26 | ||
27 | +# include <EGL/egl.h> | |
28 | # ifdef GL_GLES | |
29 | -# include <EGL/egl.h> | |
30 | /* NB: These are already included from gl_common */ | |
31 | /* # include <GLES2/gl2.h> */ | |
32 | /* # include <GLES2/gl2ext.h> */ | |
33 | @@ -65,12 +65,10 @@ | |
34 | Eina_Bool drew : 1; | |
35 | } draw; | |
36 | ||
37 | -#ifdef GL_GLES | |
38 | EGLContext egl_context[1]; | |
39 | EGLSurface egl_surface[1]; | |
40 | EGLConfig egl_config; | |
41 | EGLDisplay egl_disp; | |
42 | -#endif | |
43 | ||
44 | Eina_Bool surf : 1; | |
45 | }; | |
46 | --- efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_wl_main.c.orig 2013-11-04 12:58:09.000000000 +0100 | |
47 | +++ efl-1.8.1/src/modules/evas/engines/wayland_egl/evas_wl_main.c 2013-12-07 16:55:11.888751090 +0100 | |
48 | @@ -170,8 +170,10 @@ | |
49 | return NULL; | |
50 | } | |
51 | ||
52 | +#ifdef GL_GLES | |
53 | gw->gl_context->egldisp = gw->egl_disp; | |
54 | gw->gl_context->eglctxt = gw->egl_context[0]; | |
55 | +#endif | |
56 | ||
57 | eng_window_use(gw); | |
58 | evas_gl_common_context_resize(gw->gl_context, w, h, rot); |