forked from enlightenment/efl
evas: our API are always build in, only the header require define to be used.
This commit is contained in:
parent
ec4c2de044
commit
b1342d933d
16
configure.ac
16
configure.ac
|
@ -1811,22 +1811,6 @@ AC_DEFINE_IF([EVAS_CSERVE2],
|
||||||
[1], [Shared cache server.])
|
[1], [Shared cache server.])
|
||||||
AM_CONDITIONAL([EVAS_CSERVE2], [test "x${want_evas_cserve2}" = "xyes"])
|
AM_CONDITIONAL([EVAS_CSERVE2], [test "x${want_evas_cserve2}" = "xyes"])
|
||||||
|
|
||||||
# Evas 3D
|
|
||||||
AC_ARG_ENABLE([evas-3d],
|
|
||||||
[AC_HELP_STRING([--enable-evas-3d],
|
|
||||||
[enable 3D scene graph features on evas. @<:default=disabled@:>@])],
|
|
||||||
[
|
|
||||||
if test "x${enableval}" = "xyes" ; then
|
|
||||||
want_evas_3d="yes"
|
|
||||||
else
|
|
||||||
want_evas_3d="no"
|
|
||||||
fi
|
|
||||||
],
|
|
||||||
[want_evas_3d="no"])
|
|
||||||
|
|
||||||
AC_DEFINE_IF([EVAS_3D], [test "x${want_evas_3d}" = "xyes"], [1], [3D scene graph rendering.])
|
|
||||||
AM_CONDITIONAL([EVAS_3D], [test "x${want_evas_3d}" = "xyes"])
|
|
||||||
|
|
||||||
### Configuration
|
### Configuration
|
||||||
|
|
||||||
## Tile rotation
|
## Tile rotation
|
||||||
|
|
|
@ -279,7 +279,6 @@ _evas_proxy_redraw_set(Evas_Public_Data *e, Evas_Object_Protected_Data *obj,
|
||||||
_evas_proxy_redraw_set(e, proxy, render);
|
_evas_proxy_redraw_set(e, proxy, render);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef EVAS_3D
|
|
||||||
if (obj->proxy->proxy_textures)
|
if (obj->proxy->proxy_textures)
|
||||||
{
|
{
|
||||||
/* Flag need redraw on proxy texture source */
|
/* Flag need redraw on proxy texture source */
|
||||||
|
@ -288,7 +287,6 @@ _evas_proxy_redraw_set(Evas_Public_Data *e, Evas_Object_Protected_Data *obj,
|
||||||
source->redraw = EINA_TRUE;
|
source->redraw = EINA_TRUE;
|
||||||
EINA_COW_WRITE_END(evas_object_proxy_cow, obj->proxy, source);
|
EINA_COW_WRITE_END(evas_object_proxy_cow, obj->proxy, source);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
@ -309,11 +307,7 @@ _evas_render_phase1_direct(Evas_Public_Data *e,
|
||||||
eina_array_data_get(active_objects, i);
|
eina_array_data_get(active_objects, i);
|
||||||
|
|
||||||
if (obj->changed) evas_object_clip_recalc(obj);
|
if (obj->changed) evas_object_clip_recalc(obj);
|
||||||
#ifdef EVAS_3D
|
|
||||||
if (!obj->proxy->proxies && !obj->proxy->proxy_textures) continue;
|
if (!obj->proxy->proxies && !obj->proxy->proxy_textures) continue;
|
||||||
#else
|
|
||||||
if (!obj->proxy->proxies) continue;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (obj->smart.smart)
|
if (obj->smart.smart)
|
||||||
changed = evas_object_smart_changed_get(obj->object);
|
changed = evas_object_smart_changed_get(obj->object);
|
||||||
|
@ -340,11 +334,7 @@ _evas_render_phase1_direct(Evas_Public_Data *e,
|
||||||
obj->func->render_pre(eo_obj, obj, obj->private_data);
|
obj->func->render_pre(eo_obj, obj, obj->private_data);
|
||||||
if (obj->proxy->redraw)
|
if (obj->proxy->redraw)
|
||||||
_evas_render_prev_cur_clip_cache_add(e, obj);
|
_evas_render_prev_cur_clip_cache_add(e, obj);
|
||||||
#ifdef EVAS_3D
|
|
||||||
if (obj->proxy->proxies || obj->proxy->proxy_textures)
|
if (obj->proxy->proxies || obj->proxy->proxy_textures)
|
||||||
#else
|
|
||||||
if (obj->proxy->proxies)
|
|
||||||
#endif
|
|
||||||
{
|
{
|
||||||
if (!obj->smart.smart || evas_object_smart_changed_get(eo_obj))
|
if (!obj->smart.smart || evas_object_smart_changed_get(eo_obj))
|
||||||
{
|
{
|
||||||
|
|
|
@ -110,11 +110,7 @@ evas_object_is_source_invisible(Evas_Object *eo_obj EINA_UNUSED, Evas_Object_Pro
|
||||||
{
|
{
|
||||||
if (obj->parent_cache.src_invisible_valid)
|
if (obj->parent_cache.src_invisible_valid)
|
||||||
return obj->parent_cache.src_invisible;
|
return obj->parent_cache.src_invisible;
|
||||||
#ifdef EVAS_3D
|
|
||||||
if ((obj->proxy->proxies || obj->proxy->proxy_textures) && obj->proxy->src_invisible) return 1;
|
if ((obj->proxy->proxies || obj->proxy->proxy_textures) && obj->proxy->src_invisible) return 1;
|
||||||
#else
|
|
||||||
if (obj->proxy->proxies && obj->proxy->src_invisible) return 1;
|
|
||||||
#endif
|
|
||||||
if (!obj->smart.parent) return 0;
|
if (!obj->smart.parent) return 0;
|
||||||
Evas_Object_Protected_Data *smart_parent_pd =
|
Evas_Object_Protected_Data *smart_parent_pd =
|
||||||
eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS);
|
eo_data_scope_get(obj->smart.parent, EVAS_OBJ_CLASS);
|
||||||
|
|
Loading…
Reference in New Issue