Evas GL common: Remove uniform-related stuff
authorJean-Philippe Andre <jp.andre@samsung.com>
Mon, 2 Mar 2015 02:30:34 +0000 (11:30 +0900)
committerJean-Philippe Andre <jp.andre@samsung.com>
Mon, 2 Mar 2015 02:30:34 +0000 (11:30 +0900)
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
src/modules/evas/engines/gl_common/evas_gl_shader.c

index 7b3be65..0770162 100644 (file)
@@ -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
index 212dc85..ff5e79a 100644 (file)
@@ -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;
 }