summaryrefslogtreecommitdiff
path: root/src/modules/evas/engines/gl_common
diff options
context:
space:
mode:
authorMinkyoung Kim <mer.kim@samsung.com>2016-03-31 15:55:15 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-04-01 12:09:06 +0900
commitf10672dd7429dd98dd3b7d88d9c3c63aac392a40 (patch)
treef192a706c0e249f659dc9e8824cf09c086124f08 /src/modules/evas/engines/gl_common
parent998adbb31298d10a71fded743367f75f4cc4f2ca (diff)
evas : remove native.func.data variable and data argument of native calblacks.
Summary: Evas Image should be independent of render engine. So remove native.func.data member of RGBA_Image, Evas_GL_Image struct. And remove data argument,too. Test Plan: Local test, Tizen3.0 mobile, Desktop englitenment Reviewers: jpeg, spacegrapher, wonsik Subscribers: cedric, dkdk Differential Revision: https://phab.enlightenment.org/D3850
Diffstat (limited to '')
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_common.h9
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_context.c10
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_image.c2
-rw-r--r--src/modules/evas/engines/gl_common/evas_gl_texture.c2
4 files changed, 10 insertions, 13 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 80e1eb1a8e..4acb119b4f 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -430,11 +430,10 @@ struct _Evas_GL_Image
430 struct { 430 struct {
431 void *data; 431 void *data;
432 struct { 432 struct {
433 void (*bind) (void *data, void *image); 433 void (*bind) (void *image);
434 void (*unbind) (void *data, void *image); 434 void (*unbind) (void *image);
435 void (*free) (void *data, void *image); 435 void (*free) (void *image);
436 int (*yinvert) (void *data, void *image); 436 int (*yinvert) (void *image);
437 void *data;
438 } func; 437 } func;
439 int yinvert; 438 int yinvert;
440 int target; 439 int target;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 6680f44a80..9d5ffb0841 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -2134,7 +2134,7 @@ evas_gl_common_context_image_push(Evas_Engine_GL_Context *gc,
2134 if ((tex->im) && (tex->im->native.data)) 2134 if ((tex->im) && (tex->im->native.data))
2135 { 2135 {
2136 if (tex->im->native.func.yinvert) 2136 if (tex->im->native.func.yinvert)
2137 yinvert = tex->im->native.func.yinvert(tex->im->native.func.data, tex->im); 2137 yinvert = tex->im->native.func.yinvert(tex->im);
2138 else 2138 else
2139 yinvert = tex->im->native.yinvert; 2139 yinvert = tex->im->native.yinvert;
2140 } 2140 }
@@ -2862,7 +2862,7 @@ evas_gl_common_context_image_map_push(Evas_Engine_GL_Context *gc,
2862 if ((tex->im) && (tex->im->native.data)) 2862 if ((tex->im) && (tex->im->native.data))
2863 { 2863 {
2864 if (tex->im->native.func.yinvert) 2864 if (tex->im->native.func.yinvert)
2865 yinvert = tex->im->native.func.yinvert(tex->im->native.func.data, tex->im); 2865 yinvert = tex->im->native.func.yinvert(tex->im);
2866 else 2866 else
2867 yinvert = tex->im->native.yinvert; 2867 yinvert = tex->im->native.yinvert;
2868 } 2868 }
@@ -3065,8 +3065,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3065 if (!gc->pipe[i].array.im->native.loose) 3065 if (!gc->pipe[i].array.im->native.loose)
3066 { 3066 {
3067 if (gc->pipe[i].array.im->native.func.bind) 3067 if (gc->pipe[i].array.im->native.func.bind)
3068 gc->pipe[i].array.im->native.func.bind(gc->pipe[i].array.im->native.func.data, 3068 gc->pipe[i].array.im->native.func.bind(gc->pipe[i].array.im);
3069 gc->pipe[i].array.im);
3070 } 3069 }
3071 } 3070 }
3072 } 3071 }
@@ -3610,8 +3609,7 @@ shader_array_flush(Evas_Engine_GL_Context *gc)
3610 if (!gc->pipe[i].array.im->native.loose) 3609 if (!gc->pipe[i].array.im->native.loose)
3611 { 3610 {
3612 if (gc->pipe[i].array.im->native.func.unbind) 3611 if (gc->pipe[i].array.im->native.func.unbind)
3613 gc->pipe[i].array.im->native.func.unbind(gc->pipe[i].array.im->native.func.data, 3612 gc->pipe[i].array.im->native.func.unbind(gc->pipe[i].array.im);
3614 gc->pipe[i].array.im);
3615 } 3613 }
3616 gc->pipe[i].array.im = NULL; 3614 gc->pipe[i].array.im = NULL;
3617 } 3615 }
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 502ef91871..d982fb42ee 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -702,7 +702,7 @@ evas_gl_common_image_free(Evas_GL_Image *im)
702 } 702 }
703 703
704 if (im->native.func.free) 704 if (im->native.func.free)
705 im->native.func.free(im->native.func.data, im); 705 im->native.func.free(im);
706 706
707 if (im->cs.data) 707 if (im->cs.data)
708 { 708 {
diff --git a/src/modules/evas/engines/gl_common/evas_gl_texture.c b/src/modules/evas/engines/gl_common/evas_gl_texture.c
index 71315f6121..273adc1f0f 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_texture.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_texture.c
@@ -706,7 +706,7 @@ _pool_tex_native_new(Evas_Engine_GL_Context *gc, int w, int h, int intformat, in
706 if (im->native.loose) 706 if (im->native.loose)
707 { 707 {
708 if (im->native.func.bind) 708 if (im->native.func.bind)
709 im->native.func.bind(im->native.func.data, im); 709 im->native.func.bind(im);
710 } 710 }
711#endif 711#endif
712 712