cedric pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=914b529e3810c9fc25065394086a1e19e5321047
commit 914b529e3810c9fc25065394086a1e19e5321047 Author: Cedric BAIL <[email protected]> Date: Sat Jul 5 12:50:21 2014 +0200 evas: make partial update extention compile for every one in gl_x11 backend. --- src/modules/evas/engines/gl_x11/evas_engine.c | 7 ------- src/modules/evas/engines/gl_x11/evas_engine.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c b/src/modules/evas/engines/gl_x11/evas_engine.c index 5838e1e..803129d 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.c +++ b/src/modules/evas/engines/gl_x11/evas_engine.c @@ -68,9 +68,6 @@ typedef const char *(*glsym_func_const_char_ptr) (); #ifndef EGL_NATIVE_PIXMAP_KHR # define EGL_NATIVE_PIXMAP_KHR 0x30b0 #endif -#ifndef EGL_BUFFER_AGE_EXT -# define EGL_BUFFER_AGE_EXT 0x313d -#endif #ifndef EGL_Y_INVERTED_NOK # define EGL_Y_INVERTED_NOK 0x307F #endif @@ -85,10 +82,6 @@ unsigned int (*glsym_eglSwapBuffersWithDamage) (EGLDisplay a, void *b, const E #else -#ifndef GLX_BACK_BUFFER_AGE_EXT -# define GLX_BACK_BUFFER_AGE_EXT 0x20f4 -#endif - typedef XID (*glsym_func_xid) (); _eng_fn (*glsym_glXGetProcAddress) (const char *a) = NULL; diff --git a/src/modules/evas/engines/gl_x11/evas_engine.h b/src/modules/evas/engines/gl_x11/evas_engine.h index 603c715..9274719 100644 --- a/src/modules/evas/engines/gl_x11/evas_engine.h +++ b/src/modules/evas/engines/gl_x11/evas_engine.h @@ -125,12 +125,26 @@ extern int swap_buffer_debug_mode; extern int swap_buffer_debug; extern const char *debug_dir; +#ifdef GL_GLES + +#ifndef EGL_BUFFER_AGE_EXT +# define EGL_BUFFER_AGE_EXT 0x313d +#endif + +#else + +#ifndef GLX_BACK_BUFFER_AGE_EXT +# define GLX_BACK_BUFFER_AGE_EXT 0x20f4 +#endif + extern void (*glsym_glXQueryDrawable) (Display *a, XID b, int c, unsigned int *d); extern void (*glsym_glXSwapIntervalEXT) (Display *s, GLXDrawable b, int c); extern int (*glsym_glXSwapIntervalSGI) (int a); extern int (*glsym_glXGetVideoSync) (unsigned int *a); extern int (*glsym_glXWaitVideoSync) (int a, int b, unsigned int *c); +#endif + Outbuf *eng_window_new(Evas_Engine_Info_GL_X11 *info, Evas *e, Display *disp, Window win, int screen, Visual *vis, Colormap cmap, --
