summaryrefslogtreecommitdiff
path: root/src/lib/ector/gl/ector_gl_surface.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/ector/gl/ector_gl_surface.c')
-rw-r--r--src/lib/ector/gl/ector_gl_surface.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/ector/gl/ector_gl_surface.c b/src/lib/ector/gl/ector_gl_surface.c
index 14302e3..2ad6653 100644
--- a/src/lib/ector/gl/ector_gl_surface.c
+++ b/src/lib/ector/gl/ector_gl_surface.c
@@ -45,14 +45,11 @@ _ector_gl_surface_ector_generic_surface_renderer_factory_new(Eo *obj,
45 const Eo_Class *type) 45 const Eo_Class *type)
46{ 46{
47 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN) 47 if (type == ECTOR_RENDERER_GENERIC_SHAPE_MIXIN)
48 return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, 48 return eo_add(ECTOR_RENDERER_GL_SHAPE_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
49 ector_renderer_surface_set(obj));
50 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN) 49 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_LINEAR_MIXIN)
51 return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, 50 return eo_add(ECTOR_RENDERER_GL_GRADIENT_LINEAR_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
52 ector_renderer_surface_set(obj));
53 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN) 51 else if (type == ECTOR_RENDERER_GENERIC_GRADIENT_RADIAL_MIXIN)
54 return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, 52 return eo_add(ECTOR_RENDERER_GL_GRADIENT_RADIAL_CLASS, NULL, ector_renderer_surface_set(eoid, obj));
55 ector_renderer_surface_set(obj));
56 53
57 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type)); 54 ERR("Couldn't find class for type: %s\n", eo_class_name_get(type));
58 return NULL; 55 return NULL;
@@ -77,7 +74,7 @@ _ector_gl_surface_push(Eo *obj,
77{ 74{
78 unsigned int prog; 75 unsigned int prog;
79 76
80 eo_do(obj, prog = ector_gl_surface_shader_get(flags)); 77 prog = ector_gl_surface_shader_get(obj, flags);
81 78
82 // FIXME: Not using mapp/unmap buffer yet, nor any pipe 79 // FIXME: Not using mapp/unmap buffer yet, nor any pipe
83 // FIXME: Move some of the state change to surface drawing start ? 80 // FIXME: Move some of the state change to surface drawing start ?
@@ -328,7 +325,7 @@ _ector_gl_surface_shader_get(Eo *obj EINA_UNUSED, Ector_GL_Surface_Data *pd EINA
328static void 325static void
329_ector_gl_surface_eo_base_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED) 326_ector_gl_surface_eo_base_destructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UNUSED)
330{ 327{
331 eo_do_super(obj, ECTOR_GL_SURFACE_CLASS, eo_destructor()); 328 eo_destructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
332 329
333 eina_hash_free(shader_cache); 330 eina_hash_free(shader_cache);
334 shader_cache = NULL; 331 shader_cache = NULL;
@@ -341,7 +338,7 @@ _ector_gl_surface_eo_base_constructor(Eo *obj, Ector_GL_Surface_Data *pd EINA_UN
341{ 338{
342 Eina_Strbuf *file_path = NULL; 339 Eina_Strbuf *file_path = NULL;
343 340
344 eo_do_super(obj, ECTOR_GL_SURFACE_CLASS, obj = eo_constructor()); 341 obj = eo_constructor(eo_super(obj, ECTOR_GL_SURFACE_CLASS));
345 if (!obj) return NULL; 342 if (!obj) return NULL;
346 343
347 if (shader_cache) return obj; 344 if (shader_cache) return obj;