forked from enlightenment/efl
adapt to SEC direct texture access changes for the last time.
SVN revision: 63959
This commit is contained in:
parent
11917747d0
commit
7597814df2
|
@ -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
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue