From 93fd2263fc4f03bb3d112bc67b698642ab24be4a Mon Sep 17 00:00:00 2001 From: "Carsten Haitzler (Rasterman)" Date: Mon, 13 Jan 2014 07:02:24 +0900 Subject: [PATCH] evas gl - fix egl/gles build after alpha4 change for fonts --- src/modules/evas/engines/gl_common/evas_gl_common.h | 21 +++++++++++++++++++++ .../evas/engines/gl_common/evas_gl_texture.c | 3 +++ 2 files changed, 24 insertions(+) diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h b/src/modules/evas/engines/gl_common/evas_gl_common.h index 01f8d98..9e1579a 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -54,6 +54,27 @@ #ifndef GL_RGBA16 # define GL_RGBA16 0x805B #endif +#ifndef GL_R3_G3_B2 +# define GL_R3_G3_B2 0x2A10 +#endif +#ifndef GL_RGB4 +# define GL_RGB4 0x804F +#endif +#ifndef GL_RGB5 +# define GL_RGB5 0x8050 +#endif +#ifndef GL_RGB8 +# define GL_RGB8 0x8051 +#endif +#ifndef GL_RGB10 +# define GL_RGB10 0x8052 +#endif +#ifndef GL_RGB12 +# define GL_RGB12 0x8053 +#endif +#ifndef GL_RGB16 +# define GL_RGB16 0x8054 +#endif #ifndef GL_ALPHA4 # define GL_ALPHA4 0x803B #endif diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c index 12f9f61..2b37948 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_texture.c +++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c @@ -168,8 +168,11 @@ _tex_format_index(GLuint format) case GL_BGRA: return 0; case GL_RGB: + case GL_R3_G3_B2: case GL_RGB4: + case GL_RGB5: case GL_RGB8: + case GL_RGB10: case GL_RGB12: case GL_RGB16: return 1; -- 2.7.4