jpeg pushed a commit to branch efl-1.13.

http://git.enlightenment.org/core/efl.git/commit/?id=22e210e5ae894100cc129f0245913d6d86bc6d8e

commit 22e210e5ae894100cc129f0245913d6d86bc6d8e
Author: Jean-Philippe Andre <jp.an...@samsung.com>
Date:   Wed May 13 10:48:43 2015 +0900

    Evas filters: Fix glReadPixels usage for EGL
    
    This is a simplified version of the patch in master:
    
    commit 7a614c80f3022c4da06bd299d25bc6433caab00a
    Author: Jean-Philippe Andre <jp.an...@samsung.com>
    Date:   Wed May 13 10:16:17 2015 +0900
    
        Evas filters: Fix glReadPixels usage for EGL
    
        EGL might very well not support RGBA read mode, so we
        need to check for it first.
    
        Also remove some error logs (see previous commit), and useless
        initialization of the Evas GL engine.
    
        @fix
---
 src/modules/evas/engines/gl_generic/evas_engine.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/evas/engines/gl_generic/evas_engine.c 
b/src/modules/evas/engines/gl_generic/evas_engine.c
index e280fdd..3849331 100644
--- a/src/modules/evas/engines/gl_generic/evas_engine.c
+++ b/src/modules/evas/engines/gl_generic/evas_engine.c
@@ -1343,9 +1343,13 @@ eng_gl_surface_read_pixels(void *data, void *surface,
     */
 
    glsym_glBindFramebuffer(GL_FRAMEBUFFER, im->tex->pt->fb);
+
+#ifndef GL_GLES
    if (im->tex->pt->format == GL_BGRA)
      glReadPixels(x, y, w, h, GL_BGRA, GL_UNSIGNED_BYTE, pixels);
    else
+#endif
+
      {
         DATA32 *ptr = pixels;
         int k;

-- 


Reply via email to