jpeg pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=433d24cfa0ec815de82c8a3b35e57213dcb7b945
commit 433d24cfa0ec815de82c8a3b35e57213dcb7b945 Author: Jean-Philippe Andre <[email protected]> Date: Mon Mar 2 11:30:34 2015 +0900 Evas GL common: Remove uniform-related stuff Remove last traces of the uniforms stuff for shaders, that was removed in the following commits: 6b48c106d3261 and cfd337a758a. Don't use uniforms in the evas GL pipeline, at least not like that. --- src/modules/evas/engines/gl_common/evas_gl_common.h | 5 ----- src/modules/evas/engines/gl_common/evas_gl_shader.c | 12 ------------ 2 files changed, 17 deletions(-) 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 7b3be65..0770162 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_common.h +++ b/src/modules/evas/engines/gl_common/evas_gl_common.h @@ -302,11 +302,6 @@ struct _Evas_GL_Program GLuint vert, frag, prog; int tex_count; - struct { - GLint loc_sample; - GLint loc_yinvert; - GLint loc_mask_Absolute; - } uniforms; }; struct _Evas_GL_Program_Source diff --git a/src/modules/evas/engines/gl_common/evas_gl_shader.c b/src/modules/evas/engines/gl_common/evas_gl_shader.c index 212dc85..ff5e79a 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_shader.c +++ b/src/modules/evas/engines/gl_common/evas_gl_shader.c @@ -34,10 +34,6 @@ gl_compile_link_error(GLuint target, const char *action) } } -#define ATTACH_UNIFORM(p, name) do { \ - p->uniforms.loc_##name = glGetUniformLocation(p->prog, #name); \ - } while (0) - static int _evas_gl_common_shader_program_binary_init(Evas_GL_Program *p, const char *pname, @@ -93,10 +89,6 @@ _evas_gl_common_shader_program_binary_init(Evas_GL_Program *p, goto finish; } - ATTACH_UNIFORM(p, sample); - ATTACH_UNIFORM(p, yinvert); - ATTACH_UNIFORM(p, mask_Absolute); - res = 1; finish: @@ -212,10 +204,6 @@ _evas_gl_common_shader_program_source_init(Evas_GL_Program *p, return 0; } - ATTACH_UNIFORM(p, sample); - ATTACH_UNIFORM(p, yinvert); - ATTACH_UNIFORM(p, mask_Absolute); - return 1; } --
