jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a6950567a3adc34402d02a3b37d715818c4f9533
commit a6950567a3adc34402d02a3b37d715818c4f9533
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date: Fri Mar 7 17:45:16 2014 +0900
Evas filters: Use GL_FRAMEBUFFER instead of GL_READ_FRAMEBUFFER
GL_READ_FRAMEBUFFER isn't defined when compiling for Wayland
Thanks Stefan for the report.
Also, import GL_FRAMEBUFFER overrides from other GL files, so
that it points to the proper extension (_OES or _EXT if applicable).
---
src/modules/evas/engines/gl_x11/evas_engine.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/modules/evas/engines/gl_x11/evas_engine.c
b/src/modules/evas/engines/gl_x11/evas_engine.c
index cc44704..96d2726 100644
--- a/src/modules/evas/engines/gl_x11/evas_engine.c
+++ b/src/modules/evas/engines/gl_x11/evas_engine.c
@@ -3425,9 +3425,19 @@ eng_gl_surface_read_pixels(void *data, void *surface,
return EINA_FALSE;
}
- glsym_glBindFramebuffer(GL_READ_FRAMEBUFFER, im->tex->pt->fb);
+#ifdef GL_GLES
+# ifndef GL_FRAMEBUFFER
+# define GL_FRAMEBUFFER GL_FRAMEBUFFER_OES
+# endif
+#else
+# ifndef GL_FRAMEBUFFER
+# define GL_FRAMEBUFFER GL_FRAMEBUFFER_EXT
+# endif
+#endif
+
+ glsym_glBindFramebuffer(GL_FRAMEBUFFER, im->tex->pt->fb);
glsym_glReadPixels(x, y, w, h, GL_BGRA, GL_UNSIGNED_BYTE, pixels);
- glsym_glBindFramebuffer(GL_READ_FRAMEBUFFER, 0);
+ glsym_glBindFramebuffer(GL_FRAMEBUFFER, 0);
return EINA_TRUE;
}
//--------------------------------//
--
