sung pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9bb4c4869199118d9d16c87edc5084e8d1d49fb7
commit 9bb4c4869199118d9d16c87edc5084e8d1d49fb7 Author: Sung W. Park <[email protected]> Date: Wed Oct 30 10:47:52 2013 +0900 EvasGL: cleaning up unnecessary code. Cleaning up unnecessary code. --- src/modules/evas/engines/gl_common/evas_gl_core.c | 50 ---------------------- src/modules/evas/engines/gl_common/evas_gl_core.h | 7 --- .../evas/engines/gl_common/evas_gl_core_private.h | 1 - 3 files changed, 58 deletions(-) diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c b/src/modules/evas/engines/gl_common/evas_gl_core.c index a065bd4..e5009cd 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_core.c +++ b/src/modules/evas/engines/gl_common/evas_gl_core.c @@ -1869,38 +1869,6 @@ evgl_direct_info_clear() rsc->direct.enabled = EINA_FALSE; } -/* -void -evgl_direct_img_obj_set(Evas_Object *img, int rot) -{ - EVGL_Resource *rsc; - - if (!(rsc=_evgl_tls_resource_get())) return; - - // Normally direct rendering isn't allowed if alpha is on and - // rotation is not 0. BUT, if override is on, allow it. - if (rot!=0) - { - if (evgl_engine->direct_override) - rsc->direct.img = img; - else - rsc->direct.img = NULL; - } - else - rsc->direct.img = img; -} - -Evas_Object * -evgl_direct_img_obj_get() -{ - EVGL_Resource *rsc; - - if (!(rsc=_evgl_tls_resource_get())) return NULL; - - return rsc->direct.img; -} -*/ - Evas_GL_API * evgl_api_get() { @@ -1909,24 +1877,6 @@ evgl_api_get() return &gl_funcs; } - -/* -void -evgl_direct_img_clip_set(int c, int x, int y, int w, int h) -{ - EVGL_Resource *rsc; - - if (!(rsc=_evgl_tls_resource_get())) return; - - rsc->master_clip = c; - rsc->clip[0] = x; - rsc->clip[1] = y; - rsc->clip[2] = w; - rsc->clip[3] = h; - -} -*/ - void evgl_direct_override_get(int *override, int *force_off) { diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.h b/src/modules/evas/engines/gl_common/evas_gl_core.h index bbd5b24..587e8b0 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_core.h +++ b/src/modules/evas/engines/gl_common/evas_gl_core.h @@ -33,16 +33,9 @@ int evgl_native_surface_get(EVGL_Surface *sfc, Evas_Native_Surface *ns) Evas_GL_API *evgl_api_get(); int evgl_direct_rendered(); - -/* -extern void evgl_direct_img_obj_set(Evas_Object *img, int rot); -extern Evas_Object *evgl_direct_img_obj_get(); -*/ - void evgl_direct_info_set(int win_w, int win_h, int rot, int img_x, int img_y, int img_w, int img_h, int clip_x, int clip_y, int clip_w, int clip_h); void evgl_direct_info_clear(); -//extern void evgl_direct_img_clip_set(int c, int x, int y, int w, int h); void evgl_direct_override_get(int *override, int *force_off); #endif //_EVAS_GL_CORE_H diff --git a/src/modules/evas/engines/gl_common/evas_gl_core_private.h b/src/modules/evas/engines/gl_common/evas_gl_core_private.h index 37e8cc5..254da65 100644 --- a/src/modules/evas/engines/gl_common/evas_gl_core_private.h +++ b/src/modules/evas/engines/gl_common/evas_gl_core_private.h @@ -212,7 +212,6 @@ struct _EVGL_Resource struct { EVGLNative_Surface surface; int rendered; - //Evas_Object *img; int rot; int win_w; --
