devilhorns pushed a commit to branch master.

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

commit c1eb5de916d57587b8bb51e2c2340f95f8b42f02
Author: Chris Michael <[email protected]>
Date:   Mon Dec 1 10:31:47 2014 -0500

    evas-gl: Fix evas-gl to compile for EGL
    
    Summary: Evas compilation was broken for --with-opengl=es due to the
    use of GL_R16 (which is not defined for EGL).
    
    NB: This may Not be the Proper fix, but at least it compiles now.
    
    @fix
    
    Signed-off-by: Chris Michael <[email protected]>
---
 src/modules/evas/engines/gl_common/evas_gl_3d.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/evas/engines/gl_common/evas_gl_3d.c 
b/src/modules/evas/engines/gl_common/evas_gl_3d.c
index 7df3244..1a70473 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_3d.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_3d.c
@@ -431,7 +431,9 @@ e3d_drawable_new(int w, int h, int alpha, GLenum 
depth_format, GLenum stencil_fo
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+#ifndef GL_GLES
    glTexImage2D(GL_TEXTURE_2D, 0, GL_R16, w, h, 0, GL_RED, GL_UNSIGNED_SHORT, 
0);
+#endif
 
    glGenFramebuffers(1, &fbo);
    glBindFramebuffer(GL_FRAMEBUFFER, fbo);

-- 


Reply via email to