]>
Commit | Line | Data |
---|---|---|
c845ba09 JB |
1 | --- evas-1.2.0/src/modules/engines/wayland_egl/evas_engine.h.orig 2012-01-12 14:07:46.000000000 +0100 |
2 | +++ evas-1.2.0/src/modules/engines/wayland_egl/evas_engine.h 2012-05-27 17:32:54.658986859 +0200 | |
3 | @@ -1,6 +1,10 @@ | |
4 | #ifndef EVAS_ENGINE_H | |
5 | #define EVAS_ENGINE_H | |
6 | ||
7 | +#ifndef GLES_WAYLAND | |
8 | +#define GLES_WAYLAND 1 | |
9 | +#endif | |
10 | + | |
11 | #include "config.h" | |
12 | #include "evas_common.h" | |
13 | #include "evas_private.h" | |
14 | --- evas-1.2.0/src/modules/engines/gl_common/evas_gl_common.h.orig 2012-04-20 15:36:16.000000000 +0200 | |
15 | +++ evas-1.2.0/src/modules/engines/gl_common/evas_gl_common.h 2012-05-27 17:32:34.405654373 +0200 | |
16 | @@ -26,10 +26,10 @@ | |
17 | # include <SDL/SDL_opengl.h> | |
18 | # endif | |
19 | # else | |
20 | -# if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | |
21 | +# if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined (GLES_WAYLAND) | |
22 | # if defined(GLES_VARIETY_S3C6410) | |
23 | # include <GLES2/gl2.h> | |
24 | -# elif defined(GLES_VARIETY_SGX) | |
25 | +# elif defined(GLES_VARIETY_SGX) || defined (GLES_WAYLAND) | |
26 | # include <GLES2/gl2.h> | |
27 | # include <GLES2/gl2ext.h> | |
28 | # endif | |
29 | @@ -341,7 +341,7 @@ | |
30 | /* If this is set: Force drawing with a particular filter */ | |
31 | GLuint filter_prog; | |
32 | ||
33 | -#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | |
34 | +#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined (GLES_WAYLAND) | |
35 | // FIXME: hack. expose egl display to gl core for egl image sec extn. | |
36 | void *egldisp; | |
37 | #endif | |
38 | @@ -633,7 +633,7 @@ | |
39 | extern void (*glsym_glProgramParameteri) (GLuint a, GLuint b, GLint d); | |
40 | extern void (*glsym_glReleaseShaderCompiler)(void); | |
41 | ||
42 | -#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) | |
43 | +#if defined (GLES_VARIETY_S3C6410) || defined (GLES_VARIETY_SGX) || defined (GLES_WAYLAND) | |
44 | extern void *(*secsym_eglCreateImage) (void *a, void *b, GLenum c, void *d, const int *e); | |
45 | extern unsigned int (*secsym_eglDestroyImage) (void *a, void *b); | |
46 | extern void (*secsym_glEGLImageTargetTexture2DOES) (int a, void *b); |