From 7597814df2416e616f37d2fa518ff9a49b904e2f Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Mon, 10 Oct 2011 10:08:29 +0000 Subject: [PATCH] adapt to SEC direct texture access changes for the last time. SVN revision: 63959 --- .../src/modules/engines/gl_common/evas_gl_common.h | 13 ++++++++----- .../src/modules/engines/gl_common/evas_gl_context.c | 4 ++-- .../src/modules/engines/gl_common/evas_gl_texture.c | 1 + 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h b/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h index 34a0cc9428..5c75b0be1e 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_common.h @@ -78,20 +78,23 @@ #ifndef EGL_MAP_GL_TEXTURE_RGBA_SEC # define EGL_MAP_GL_TEXTURE_RGBA_SEC 0x3206 #endif +#ifndef EGL_MAP_GL_TEXTURE_BGRA_SEC +# define EGL_MAP_GL_TEXTURE_BGRA_SEC 0x3206 +#endif #ifndef EGL_MAP_GL_TEXTURE_LUMINANCE_SEC -# define EGL_MAP_GL_TEXTURE_LUMINANCE_SEC 0x3207 +# define EGL_MAP_GL_TEXTURE_LUMINANCE_SEC 0x3208 #endif #ifndef EGL_MAP_GL_TEXTURE_LUMINANCE_ALPHA_SEC -# define EGL_MAP_GL_TEXTURE_LUMINANCE_ALPHA_SEC 0x3208 +# define EGL_MAP_GL_TEXTURE_LUMINANCE_ALPHA_SEC 0x3209 #endif #ifndef EGL_MAP_GL_TEXTURE_PIXEL_TYPE_SEC -# define EGL_MAP_GL_TEXTURE_PIXEL_TYPE_SEC 0x3209 +# define EGL_MAP_GL_TEXTURE_PIXEL_TYPE_SEC 0x320a #endif #ifndef EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC -# define EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC 0x3210 +# define EGL_MAP_GL_TEXTURE_UNSIGNED_BYTE_SEC 0x320b #endif #ifndef EGL_MAP_GL_TEXTURE_STRIDE_IN_BYTES_SEC -# define EGL_MAP_GL_TEXTURE_STRIDE_IN_BYTES_SEC 0x3211 +# define EGL_MAP_GL_TEXTURE_STRIDE_IN_BYTES_SEC 0x320c #endif #ifndef GL_PROGRAM_BINARY_LENGTH # define GL_PROGRAM_BINARY_LENGTH 0x8741 diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c index 2e765888c6..36eeab2b5a 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_context.c @@ -1433,7 +1433,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc, if (tex->pt->dyn.img) { prog = gc->shared->shader[evas_gl_common_shader_choice(0, NULL, r, g, b, a, - SHADER_IMG_NOMUL, SHADER_IMG)].prog; + SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA)].prog; } else { @@ -2101,7 +2101,7 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc, if (tex->pt->dyn.img) { prog = gc->shared->shader[evas_gl_common_shader_choice(npoints, p, r, g, b, a, - SHADER_IMG_NOMUL, SHADER_IMG)].prog; + SHADER_IMG_BGRA_NOMUL, SHADER_IMG_BGRA)].prog; } else { diff --git a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c b/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c index b3fcc9cb7a..0c12d7d61a 100644 --- a/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c +++ b/legacy/evas/src/modules/engines/gl_common/evas_gl_texture.c @@ -490,6 +490,7 @@ _pool_tex_dynamic_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, i case GL_LUMINANCE_ALPHA: attr[5] = EGL_MAP_GL_TEXTURE_LUMINANCE_ALPHA_SEC; break; #endif case GL_RGBA: attr[5] = EGL_MAP_GL_TEXTURE_RGBA_SEC; break; + case GL_BGRA: attr[5] = EGL_MAP_GL_TEXTURE_BGRA_SEC; break; default: fprintf(stderr, "unknown format\n"); return NULL; }