raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5213599b5aa2cc0dc85739b9b3c7b8953380f72d
commit 5213599b5aa2cc0dc85739b9b3c7b8953380f72d Author: Carsten Haitzler (Rasterman) <[email protected]> Date: Thu Feb 12 22:25:06 2015 +0900 evas 3d - undo async block code - 3d objects dont inherit from evas obj --- src/lib/evas/canvas/evas_3d_camera.c | 6 ------ src/lib/evas/canvas/evas_3d_light.c | 14 -------------- src/lib/evas/canvas/evas_3d_material.c | 13 +++---------- src/lib/evas/canvas/evas_3d_mesh.c | 29 ++--------------------------- src/lib/evas/canvas/evas_3d_node.c | 20 -------------------- src/lib/evas/canvas/evas_3d_object.c | 5 +---- src/lib/evas/canvas/evas_3d_scene.c | 17 +++-------------- src/lib/evas/canvas/evas_3d_texture.c | 16 ++-------------- 8 files changed, 11 insertions(+), 109 deletions(-) diff --git a/src/lib/evas/canvas/evas_3d_camera.c b/src/lib/evas/canvas/evas_3d_camera.c index b72c173..c6da2d3 100644 --- a/src/lib/evas/canvas/evas_3d_camera.c +++ b/src/lib/evas/canvas/evas_3d_camera.c @@ -15,7 +15,6 @@ _camera_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key, EOLIAN static void _evas_3d_camera_evas_3d_object_change_notify(Eo *obj,Evas_3D_Camera_Data *pd, Evas_3D_State state EINA_UNUSED, Evas_3D_Object *ref EINA_UNUSED) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->nodes) eina_hash_foreach(pd->nodes, _camera_node_change_notify, obj); } @@ -75,7 +74,6 @@ EOLIAN static void _evas_3d_camera_eo_base_destructor(Eo *obj, Evas_3D_Camera_Data *pd) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); //evas_3d_object_unreference(&pd->base); if (pd->nodes) eina_hash_free(pd->nodes); eo_do_super(obj, MY_CLASS, eo_destructor()); @@ -95,7 +93,6 @@ EOLIAN static void _evas_3d_camera_projection_matrix_set(Eo *obj, Evas_3D_Camera_Data *pd, const Evas_Real *matrix) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_mat4_array_set(&pd->projection, matrix); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_CAMERA_PROJECTION, NULL)); } @@ -119,7 +116,6 @@ _evas_3d_camera_projection_perspective_set(Eo *obj, Evas_3D_Camera_Data *pd, ymax = dnear * (Evas_Real)tan((double)fovy * M_PI / 360.0); xmax = ymax * aspect; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_mat4_frustum_set(&pd->projection, -xmax, xmax, -ymax, ymax, dnear, dfar); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_CAMERA_PROJECTION, NULL)); } @@ -130,7 +126,6 @@ _evas_3d_camera_projection_frustum_set(Eo *obj, Evas_3D_Camera_Data *pd, Evas_Real bottom, Evas_Real top, Evas_Real dnear, Evas_Real dfar) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_mat4_frustum_set(&pd->projection, left, right, bottom, top, dnear, dfar); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_CAMERA_PROJECTION, NULL)); } @@ -141,7 +136,6 @@ _evas_3d_camera_projection_ortho_set(Eo *obj, Evas_3D_Camera_Data *pd, Evas_Real bottom, Evas_Real top, Evas_Real dnear, Evas_Real dfar) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_mat4_ortho_set(&pd->projection, left, right, bottom, top, dnear, dfar); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_CAMERA_PROJECTION, NULL)); } diff --git a/src/lib/evas/canvas/evas_3d_light.c b/src/lib/evas/canvas/evas_3d_light.c index 48abf0f..f9ca75b 100644 --- a/src/lib/evas/canvas/evas_3d_light.c +++ b/src/lib/evas/canvas/evas_3d_light.c @@ -15,7 +15,6 @@ _light_node_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key, EOLIAN static void _evas_3d_light_evas_3d_object_change_notify(Eo *obj, Evas_3D_Light_Data *pd, Evas_3D_State state EINA_UNUSED, Evas_3D_Object *ref EINA_UNUSED) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->nodes) eina_hash_foreach(pd->nodes, _light_node_change_notify, obj); } @@ -98,7 +97,6 @@ _evas_3d_light_eo_base_constructor(Eo *obj, Evas_3D_Light_Data *pd) EOLIAN static void _evas_3d_light_eo_base_destructor(Eo *obj, Evas_3D_Light_Data *pd) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->nodes) eina_hash_free(pd->nodes); eo_do_super(obj, MY_CLASS, eo_destructor()); @@ -108,7 +106,6 @@ _evas_3d_light_eo_base_destructor(Eo *obj, Evas_3D_Light_Data *pd) EOLIAN static void _evas_3d_light_directional_set(Eo *obj, Evas_3D_Light_Data *pd, Eina_Bool directional) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->directional != directional) { pd->directional = directional; @@ -125,7 +122,6 @@ _evas_3d_light_directional_get(Eo *obj EINA_UNUSED, Evas_3D_Light_Data *pd) EOLIAN static void _evas_3d_light_ambient_set(Eo *obj, Evas_3D_Light_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->ambient.r = r; pd->ambient.g = g; pd->ambient.b = b; @@ -146,7 +142,6 @@ _evas_3d_light_ambient_get(Eo *obj EINA_UNUSED, Evas_3D_Light_Data *pd, Evas_Rea EOLIAN static void _evas_3d_light_diffuse_set(Eo *obj, Evas_3D_Light_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->diffuse.r = r; pd->diffuse.g = g; pd->diffuse.b = b; @@ -167,7 +162,6 @@ _evas_3d_light_diffuse_get(Eo *obj EINA_UNUSED, Evas_3D_Light_Data *pd, Evas_Rea EOLIAN static void _evas_3d_light_specular_set(Eo *obj, Evas_3D_Light_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->specular.r = r; pd->specular.g = g; pd->specular.b = b; @@ -188,7 +182,6 @@ _evas_3d_light_specular_get(Eo *obj EINA_UNUSED, Evas_3D_Light_Data *pd, Evas_Re EOLIAN static void _evas_3d_light_spot_exponent_set(Eo *obj, Evas_3D_Light_Data *pd, Evas_Real exponent) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->spot_exp = exponent; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_LIGHT_SPOT_EXP, NULL)); } @@ -202,7 +195,6 @@ _evas_3d_light_spot_exponent_get(Eo *obj EINA_UNUSED, Evas_3D_Light_Data *pd) EOLIAN static void _evas_3d_light_spot_cutoff_set(Eo *obj, Evas_3D_Light_Data *pd, Evas_Real cutoff) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->spot_cutoff = cutoff; pd->spot_cutoff_cos = cos(cutoff * M_PI / 180.0); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_LIGHT_SPOT_CUTOFF, NULL)); @@ -217,7 +209,6 @@ _evas_3d_light_spot_cutoff_get(Eo *obj EINA_UNUSED, Evas_3D_Light_Data *pd) EOLIAN static void _evas_3d_light_attenuation_set(Eo *obj, Evas_3D_Light_Data *pd, Evas_Real constant, Evas_Real linear, Evas_Real quadratic) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->atten_const = constant; pd->atten_linear = linear; pd->atten_quad = quadratic; @@ -235,7 +226,6 @@ _evas_3d_light_attenuation_get(Eo *obj EINA_UNUSED, Evas_3D_Light_Data *pd, Evas EOLIAN static void _evas_3d_light_attenuation_enable_set(Eo *obj, Evas_3D_Light_Data *pd, Eina_Bool enable) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->enable_attenuation != enable) { pd->enable_attenuation = enable; @@ -253,7 +243,6 @@ EOLIAN static void _evas_3d_light_projection_matrix_set(Eo *obj, Evas_3D_Light_Data *pd, const Evas_Real *matrix) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_mat4_array_set(&pd->projection, matrix); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_LIGHT_PROJECTION, NULL)); } @@ -277,7 +266,6 @@ _evas_3d_light_projection_perspective_set(Eo *obj, Evas_3D_Light_Data *pd, ymax = dnear * (Evas_Real)tan((double)fovy * M_PI / 360.0); xmax = ymax * aspect; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_mat4_frustum_set(&pd->projection, -xmax, xmax, -ymax, ymax, dnear, dfar); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_LIGHT_PROJECTION, NULL)); } @@ -288,7 +276,6 @@ _evas_3d_light_projection_frustum_set(Eo *obj, Evas_3D_Light_Data *pd, Evas_Real bottom, Evas_Real top, Evas_Real dnear, Evas_Real dfar) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_mat4_frustum_set(&pd->projection, left, right, bottom, top, dnear, dfar); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_LIGHT_PROJECTION, NULL)); } @@ -299,7 +286,6 @@ _evas_3d_light_projection_ortho_set(Eo *obj, Evas_3D_Light_Data *pd, Evas_Real bottom, Evas_Real top, Evas_Real dnear, Evas_Real dfar) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_mat4_ortho_set(&pd->projection, left, right, bottom, top, dnear, dfar); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_LIGHT_PROJECTION, NULL)); } diff --git a/src/lib/evas/canvas/evas_3d_material.c b/src/lib/evas/canvas/evas_3d_material.c index ca0b403..8cd325d 100644 --- a/src/lib/evas/canvas/evas_3d_material.c +++ b/src/lib/evas/canvas/evas_3d_material.c @@ -15,16 +15,14 @@ _material_mesh_change_notify(const Eina_Hash *hash EINA_UNUSED, const void *key, EOLIAN static void _evas_3d_material_evas_3d_object_change_notify(Eo *obj, Evas_3D_Material_Data *pd, Evas_3D_State state EINA_UNUSED, Evas_3D_Object *ref EINA_UNUSED) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->meshes) eina_hash_foreach(pd->meshes, _material_mesh_change_notify, obj); } EOLIAN static void -_evas_3d_material_evas_3d_object_update_notify(Eo *obj, Evas_3D_Material_Data *pd) +_evas_3d_material_evas_3d_object_update_notify(Eo *obj EINA_UNUSED, Evas_3D_Material_Data *pd) { int i; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); for (i = 0; i < EVAS_3D_MATERIAL_ATTRIB_COUNT; i++) { if (pd->attribs[i].enable) @@ -108,7 +106,6 @@ _evas_3d_material_eo_base_destructor(Eo *obj, Evas_3D_Material_Data *pd) { int i; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->meshes) eina_hash_free(pd->meshes); @@ -124,9 +121,8 @@ _evas_3d_material_eo_base_destructor(Eo *obj, Evas_3D_Material_Data *pd) } EOLIAN static void -_evas_3d_material_enable_set(Eo *obj, Evas_3D_Material_Data *pd, Evas_3D_Material_Attrib attrib, Eina_Bool enable) +_evas_3d_material_enable_set(Eo *obj EINA_UNUSED, Evas_3D_Material_Data *pd, Evas_3D_Material_Attrib attrib, Eina_Bool enable) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->attribs[attrib].enable = enable; } @@ -139,7 +135,6 @@ _evas_3d_material_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Material_Data *pd, Eva EOLIAN static void _evas_3d_material_color_set(Eo *obj, Evas_3D_Material_Data *pd, Evas_3D_Material_Attrib attrib, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_color_set(&pd->attribs[attrib].color, r, g, b, a); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MATERIAL_COLOR, NULL)); } @@ -154,9 +149,8 @@ _evas_3d_material_color_get(Eo *obj EINA_UNUSED, Evas_3D_Material_Data *pd, Evas } EOLIAN static void -_evas_3d_material_shininess_set(Eo *obj, Evas_3D_Material_Data *pd, Evas_Real shininess) +_evas_3d_material_shininess_set(Eo *obj EINA_UNUSED, Evas_3D_Material_Data *pd, Evas_Real shininess) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->shininess = shininess; } @@ -169,7 +163,6 @@ _evas_3d_material_shininess_get(Eo *obj EINA_UNUSED, Evas_3D_Material_Data *pd) EOLIAN static void _evas_3d_material_texture_set(Eo *obj, Evas_3D_Material_Data *pd, Evas_3D_Material_Attrib attrib, Evas_3D_Texture *texture) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->attribs[attrib].texture != texture) { if (pd->attribs[attrib].texture) diff --git a/src/lib/evas/canvas/evas_3d_mesh.c b/src/lib/evas/canvas/evas_3d_mesh.c index 55b1d47..44304380 100644 --- a/src/lib/evas/canvas/evas_3d_mesh.c +++ b/src/lib/evas/canvas/evas_3d_mesh.c @@ -182,12 +182,11 @@ _evas_3d_mesh_evas_3d_object_change_notify(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_ } EOLIAN static void -_evas_3d_mesh_evas_3d_object_update_notify(Eo *obj, Evas_3D_Mesh_Data *pd) +_evas_3d_mesh_evas_3d_object_update_notify(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) { Eina_List *l; Evas_3D_Mesh_Frame *f; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); EINA_LIST_FOREACH(pd->frames, l, f) { if (f->material) @@ -260,16 +259,14 @@ _evas_3d_mesh_eo_base_constructor(Eo *obj, Evas_3D_Mesh_Data *pd) EOLIAN static void _evas_3d_mesh_eo_base_destructor(Eo *obj, Evas_3D_Mesh_Data *pd) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); //evas_3d_object_unreference(&pd->base); _mesh_fini(pd); eo_do_super(obj, MY_CLASS, eo_destructor()); } EOLIAN static void -_evas_3d_mesh_shade_mode_set(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Shade_Mode mode) +_evas_3d_mesh_shade_mode_set(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd, Evas_3D_Shade_Mode mode) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->shade_mode != mode) { pd->shade_mode = mode; @@ -286,7 +283,6 @@ _evas_3d_mesh_shade_mode_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) EOLIAN static void _evas_3d_mesh_vertex_count_set(Eo *obj, Evas_3D_Mesh_Data *pd, unsigned int count) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->vertex_count = count; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_VERTEX_COUNT, NULL)); } @@ -308,7 +304,6 @@ _evas_3d_mesh_frame_add(Eo *obj, Evas_3D_Mesh_Data *pd, int frame) return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); f = evas_3d_mesh_frame_new(obj); if (f == NULL) @@ -330,7 +325,6 @@ _evas_3d_mesh_frame_del(Eo *obj, Evas_3D_Mesh_Data *pd, int frame) return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->frames = eina_list_remove(pd->frames, f); evas_3d_mesh_frame_free(f); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_FRAME, NULL)); @@ -350,7 +344,6 @@ _evas_3d_mesh_frame_material_set(Eo *obj, Evas_3D_Mesh_Data *pd, int frame, Evas if (f->material == material) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (f->material) { evas_3d_material_mesh_del(f->material, obj); @@ -395,7 +388,6 @@ _evas_3d_mesh_frame_vertex_data_set(Eo *obj, Evas_3D_Mesh_Data *pd, int frame, E return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (attrib == EVAS_3D_VERTEX_POSITION) { int i = 0, j = 0, size = stride/sizeof(float); @@ -479,7 +471,6 @@ _evas_3d_mesh_frame_vertex_data_copy_set(Eo *obj, Evas_3D_Mesh_Data *pd, int fra return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (attrib == EVAS_3D_VERTEX_POSITION) { element_count = 3; @@ -608,7 +599,6 @@ _evas_3d_mesh_frame_vertex_data_map(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd, return NULL; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); f->vertices[attrib].mapped = EINA_TRUE; return f->vertices[attrib].data; } @@ -630,7 +620,6 @@ _evas_3d_mesh_frame_vertex_data_unmap(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); f->vertices[attrib].mapped = EINA_FALSE; } @@ -651,7 +640,6 @@ _evas_3d_mesh_frame_vertex_stride_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd EOLIAN static void _evas_3d_mesh_index_data_set(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Index_Format format, int count, const void *indices) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->owns_indices && pd->indices) free(pd->indices); @@ -683,7 +671,6 @@ _evas_3d_mesh_index_data_copy_set(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd, Ev return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (!pd->owns_indices || pd->index_size < size) { if (pd->owns_indices && pd->indices) @@ -729,7 +716,6 @@ _evas_3d_mesh_index_data_map(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) return NULL; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->index_mapped = EINA_TRUE; return pd->indices; } @@ -743,14 +729,12 @@ _evas_3d_mesh_index_data_unmap(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->index_mapped = EINA_FALSE; } EOLIAN static void _evas_3d_mesh_vertex_assembly_set(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Vertex_Assembly assembly) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->assembly = assembly; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_VERTEX_ASSEMBLY, NULL)); } @@ -758,14 +742,12 @@ _evas_3d_mesh_vertex_assembly_set(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Vertex EOLIAN static Evas_3D_Vertex_Assembly _evas_3d_mesh_vertex_assembly_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); return pd->assembly; } EOLIAN static void _evas_3d_mesh_fog_color_set(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_color_set(&pd->fog_color, r, g, b, a); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_FOG, NULL)); } @@ -783,7 +765,6 @@ _evas_3d_mesh_fog_color_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd, EOLIAN static void _evas_3d_mesh_fog_enable_set(Eo *obj, Evas_3D_Mesh_Data *pd, Eina_Bool enabled) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->fog_enabled = enabled; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_FOG, NULL)); } @@ -797,7 +778,6 @@ _evas_3d_mesh_fog_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) EOLIAN static void _evas_3d_mesh_blending_enable_set(Eo *obj, Evas_3D_Mesh_Data *pd, Eina_Bool blending) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->blending = blending; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_BLENDING, NULL)); } @@ -811,7 +791,6 @@ _evas_3d_mesh_blending_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) EOLIAN static void _evas_3d_mesh_blending_func_set(Eo *obj, Evas_3D_Mesh_Data *pd, Evas_3D_Blend_Func sfactor, Evas_3D_Blend_Func dfactor) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->blend_sfactor = sfactor; pd->blend_dfactor = dfactor; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_BLENDING, NULL)); @@ -829,7 +808,6 @@ EOLIAN static void _evas_3d_mesh_mmap_set(Eo *obj, Evas_3D_Mesh_Data *pd, Eina_File *file, const char *key EINA_UNUSED) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); _mesh_fini(pd); _mesh_init(pd); @@ -843,7 +821,6 @@ _evas_3d_mesh_efl_file_file_set(Eo *obj, Evas_3D_Mesh_Data *pd, const char *file, const char *key EINA_UNUSED) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); _mesh_fini(pd); _mesh_init(pd); @@ -861,7 +838,6 @@ _evas_3d_mesh_efl_file_save(Eo *obj, Evas_3D_Mesh_Data *pd, { if ((file == NULL) || (obj == NULL) || (pd == NULL)) return EINA_FALSE; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); Evas_3D_Mesh_Frame *f = evas_3d_mesh_frame_find(pd, 0); if (f == NULL) @@ -998,7 +974,6 @@ _evas_3d_mesh_color_pick_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Mesh_Data *pd) EOLIAN static Eina_Bool _evas_3d_mesh_color_pick_enable_set(Eo *obj, Evas_3D_Mesh_Data *pd, Eina_Bool _enabled) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->color_pick_enabled != _enabled) pd->color_pick_enabled = _enabled; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_MESH_COLOR_PICK, NULL)); diff --git a/src/lib/evas/canvas/evas_3d_node.c b/src/lib/evas/canvas/evas_3d_node.c index ead5694..62e2c1c 100644 --- a/src/lib/evas/canvas/evas_3d_node.c +++ b/src/lib/evas/canvas/evas_3d_node.c @@ -85,7 +85,6 @@ _evas_3d_node_evas_3d_object_change_notify(Eo *obj, Evas_3D_Node_Data *pd, Evas_ Eina_Bool scale; Eina_Bool parent_change; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); /* Notify all scenes using this node that it has changed. */ if (pd->scenes_root) eina_hash_foreach(pd->scenes_root, _node_scene_root_change_notify, obj); @@ -458,7 +457,6 @@ _node_update_done(Evas_3D_Node *obj, void *data EINA_UNUSED) EOLIAN static void _evas_3d_node_evas_3d_object_update_notify(Eo *obj, Evas_3D_Node_Data *pd EINA_UNUSED) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); /* Update transform. */ evas_3d_node_tree_traverse(obj, EVAS_3D_TREE_TRAVERSE_LEVEL_ORDER, EINA_FALSE, _node_transform_update, NULL); @@ -935,7 +933,6 @@ _evas_3d_node_member_add(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Node *member) ERR("Failed to add a member node (adding to itself)."); return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); Evas_3D_Node_Data *pdmember = eo_data_scope_get(member, MY_CLASS); if (pdmember->parent == obj) return; @@ -976,7 +973,6 @@ _evas_3d_node_member_del(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Node *member) return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); /* Delete the member node. */ pd->members = eina_list_remove(pd->members, member); pdmember->parent = NULL; @@ -1000,14 +996,12 @@ _evas_3d_node_parent_get(Eo *obj EINA_UNUSED, Evas_3D_Node_Data *pd) EOLIAN static const Eina_List * _evas_3d_node_member_list_get(Eo *obj EINA_UNUSED, Evas_3D_Node_Data *pd) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); return pd->members; } EOLIAN static void _evas_3d_node_position_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_Real x, Evas_Real y, Evas_Real z) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->position.x = x; pd->position.y = y; pd->position.z = z; @@ -1018,7 +1012,6 @@ _evas_3d_node_position_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_Real x, Evas_Rea EOLIAN static void _evas_3d_node_orientation_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_Real x, Evas_Real y, Evas_Real z, Evas_Real w) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->orientation.x = x; pd->orientation.y = y; pd->orientation.z = z; @@ -1035,7 +1028,6 @@ _evas_3d_node_orientation_angle_axis_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_Real s = sin(half_angle); Evas_Vec3 axis; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_vec3_set(&axis, x, y, z); evas_vec3_normalize(&axis, &axis); @@ -1050,7 +1042,6 @@ _evas_3d_node_orientation_angle_axis_set(Eo *obj, Evas_3D_Node_Data *pd, EOLIAN static void _evas_3d_node_scale_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_Real x, Evas_Real y, Evas_Real z) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->scale.x = x; pd->scale.y = y; pd->scale.z = z; @@ -1143,7 +1134,6 @@ _evas_3d_node_scale_get(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Space space, EOLIAN static void _evas_3d_node_position_inherit_set(Eo *obj, Evas_3D_Node_Data *pd, Eina_Bool inherit) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->position_inherit = inherit; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_NODE_TRANSFORM_POSITION, NULL)); } @@ -1151,7 +1141,6 @@ _evas_3d_node_position_inherit_set(Eo *obj, Evas_3D_Node_Data *pd, Eina_Bool inh EOLIAN static void _evas_3d_node_orientation_inherit_set(Eo *obj, Evas_3D_Node_Data *pd, Eina_Bool inherit) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->orientation_inherit = inherit; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_NODE_TRANSFORM_ORIENTATION, NULL)); } @@ -1159,7 +1148,6 @@ _evas_3d_node_orientation_inherit_set(Eo *obj, Evas_3D_Node_Data *pd, Eina_Bool EOLIAN static void _evas_3d_node_scale_inherit_set(Eo *obj, Evas_3D_Node_Data *pd, Eina_Bool inherit) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->scale_inherit = inherit; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_NODE_TRANSFORM_SCALE, NULL)); } @@ -1191,7 +1179,6 @@ _evas_3d_node_look_at_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_Vec3 up; Evas_Vec3 x, y, z; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); /* Target position in parent space. */ if (target_space == EVAS_3D_SPACE_LOCAL) { @@ -1305,7 +1292,6 @@ _evas_3d_node_camera_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Camera *camera) if (pd->data.camera.camera == camera) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->data.camera.camera) { /* Detach previous camera object. */ @@ -1341,7 +1327,6 @@ _evas_3d_node_light_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Light *light) if (pd->data.light.light == light) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->data.light.light) { /* Detach previous light object. */ @@ -1382,7 +1367,6 @@ _evas_3d_node_mesh_add(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Mesh *mesh) return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if ((nm = _node_mesh_new(obj, mesh)) == NULL) { ERR("Failed to create node mesh."); @@ -1417,7 +1401,6 @@ _evas_3d_node_mesh_del(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Mesh *mesh) return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (!eina_hash_del(pd->data.mesh.node_meshes, &mesh, NULL)) { ERR("The given mesh doesn't belong to this node."); @@ -1435,7 +1418,6 @@ _evas_3d_node_mesh_del(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Mesh *mesh) EOLIAN static const Eina_List * _evas_3d_node_mesh_list_get(Eo *obj EINA_UNUSED, Evas_3D_Node_Data *pd) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); return pd->data.mesh.meshes; } @@ -1450,7 +1432,6 @@ _evas_3d_node_mesh_frame_set(Eo *obj, Evas_3D_Node_Data *pd, Evas_3D_Mesh *mesh, return; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if ((nm = eina_hash_find(pd->data.mesh.node_meshes, &mesh)) == NULL) { ERR("The given mesh doesn't belongs to this node."); @@ -1472,7 +1453,6 @@ _evas_3d_node_mesh_frame_get(Eo *obj EINA_UNUSED, Evas_3D_Node_Data *pd, Evas_3D return 0; } - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if ((nm = eina_hash_find(pd->data.mesh.node_meshes, &mesh)) == NULL) { ERR("The given mesh doesn't belongs to this node."); diff --git a/src/lib/evas/canvas/evas_3d_object.c b/src/lib/evas/canvas/evas_3d_object.c index ba1ecdc..8116d09 100644 --- a/src/lib/evas/canvas/evas_3d_object.c +++ b/src/lib/evas/canvas/evas_3d_object.c @@ -22,9 +22,8 @@ EOLIAN static Evas * } EOLIAN static void -_evas_3d_object_type_set(Eo *obj, Evas_3D_Object_Data *pd, Evas_3D_Object_Type type) +_evas_3d_object_type_set(Eo *obj EINA_UNUSED, Evas_3D_Object_Data *pd, Evas_3D_Object_Type type) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->type = type; } @@ -47,7 +46,6 @@ _evas_3d_object_change(Eo *obj, Evas_3D_Object_Data *pd, Evas_3D_State state, Ev if (pd->dirty[state]) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->dirty[state] = EINA_TRUE; pd->dirty[EVAS_3D_STATE_ANY] = EINA_TRUE; @@ -60,7 +58,6 @@ _evas_3d_object_update(Eo *obj, Evas_3D_Object_Data *pd) if (!pd->dirty[EVAS_3D_STATE_ANY]) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); eo_do(obj, evas_3d_object_update_notify()); memset(&pd->dirty[0], 0x00, sizeof(Eina_Bool) * EVAS_3D_STATE_MAX); diff --git a/src/lib/evas/canvas/evas_3d_scene.c b/src/lib/evas/canvas/evas_3d_scene.c index edab292..a26b6c8 100644 --- a/src/lib/evas/canvas/evas_3d_scene.c +++ b/src/lib/evas/canvas/evas_3d_scene.c @@ -24,12 +24,11 @@ evas_3d_scene_data_fini(Evas_3D_Scene_Public_Data *data) } EOLIAN static void -_evas_3d_scene_evas_3d_object_change_notify(Eo *eo_obj, Evas_3D_Scene_Data *pd, Evas_3D_State state EINA_UNUSED, Evas_3D_Object *ref EINA_UNUSED) +_evas_3d_scene_evas_3d_object_change_notify(Eo *eo_obj EINA_UNUSED, Evas_3D_Scene_Data *pd, Evas_3D_State state EINA_UNUSED, Evas_3D_Object *ref EINA_UNUSED) { Eina_List *l; Evas_Object *eo; - evas_object_async_block(eo_data_scope_get(eo_obj, EVAS_OBJECT_CLASS)); EINA_LIST_FOREACH(pd->images, l, eo) { Evas_Object_Protected_Data *obj = eo_data_scope_get(eo, EVAS_OBJECT_CLASS); @@ -38,9 +37,8 @@ _evas_3d_scene_evas_3d_object_change_notify(Eo *eo_obj, Evas_3D_Scene_Data *pd, } EOLIAN static void -_evas_3d_scene_evas_3d_object_update_notify(Eo *obj, Evas_3D_Scene_Data *pd) +_evas_3d_scene_evas_3d_object_update_notify(Eo *obj EINA_UNUSED, Evas_3D_Scene_Data *pd) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->root_node) { eo_do(pd->root_node, evas_3d_object_update()); @@ -82,7 +80,6 @@ _evas_3d_scene_root_node_set(Eo *obj, Evas_3D_Scene_Data *pd, Evas_3D_Node *node if (pd->root_node == node) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->root_node) { evas_3d_node_scene_root_del(pd->root_node, obj); @@ -112,7 +109,6 @@ _evas_3d_scene_camera_node_set(Eo *obj, Evas_3D_Scene_Data *pd, Evas_3D_Node *no if (pd->camera_node == node) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->camera_node) { evas_3d_node_scene_camera_del(pd->camera_node, obj); @@ -139,7 +135,6 @@ _evas_3d_scene_camera_node_get(Eo *obj EINA_UNUSED, Evas_3D_Scene_Data *pd) EOLIAN static void _evas_3d_scene_size_set(Eo *obj EINA_UNUSED, Evas_3D_Scene_Data *pd, int w, int h) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->w = w; pd->h = h; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_SCENE_SIZE, NULL)); @@ -156,7 +151,6 @@ EOLIAN static void _evas_3d_scene_background_color_set(Eo *obj EINA_UNUSED, Evas_3D_Scene_Data *pd, Evas_Real r, Evas_Real g, Evas_Real b, Evas_Real a) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); evas_color_set(&pd->bg_color, r, g, b, a); eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_SCENE_BACKGROUND_COLOR, NULL)); } @@ -636,13 +630,12 @@ _evas_3d_scene_pick(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x, Evas_Real y, Evas_3D_Camera_Data *pd_camera; Evas_3D_Object_Data *pd_parent; Evas_Public_Data *e; - int tex = 0, px, py;; + int tex, px, py;; double redcomponent; Eina_Stringshare *tmp; Eina_Array *arr = NULL; Eina_Bool update_scene = EINA_FALSE; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd_parent = eo_data_scope_get(obj, EVAS_3D_OBJECT_CLASS); e = eo_data_scope_get(pd_parent->evas, EVAS_CANVAS_CLASS); @@ -759,7 +752,6 @@ _evas_3d_scene_exist(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x, Evas_Real y, data.s = 0.0; data.t = 0.0; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); /* Update the scene graph. */ eo_do(obj, evas_3d_object_update()); pd_camera_node = eo_data_scope_get(pd->camera_node, EVAS_3D_NODE_CLASS); @@ -786,7 +778,6 @@ _evas_3d_scene_pick_member_list_get(Eo *obj, Evas_3D_Scene_Data *pd, Evas_Real x void *node; Eina_Bool pick = EINA_FALSE; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); /* Check pick for given scene. */ pick = eo_do(obj, evas_3d_scene_pick(x, y, NULL, NULL, NULL, NULL)); @@ -814,7 +805,6 @@ _evas_3d_scene_shadows_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Scene_Data *pd) EOLIAN static void _evas_3d_scene_shadows_enable_set(Eo *obj EINA_UNUSED, Evas_3D_Scene_Data *pd, Eina_Bool _shadows_enabled) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); pd->shadows_enabled = _shadows_enabled; eo_do(obj, evas_3d_object_change(EVAS_3D_STATE_SCENE_SHADOWS_ENABLED, NULL)); } @@ -828,7 +818,6 @@ _evas_3d_scene_color_pick_enable_get(Eo *obj EINA_UNUSED, Evas_3D_Scene_Data *pd EOLIAN static Eina_Bool _evas_3d_scene_color_pick_enable_set(Eo *obj EINA_UNUSED, Evas_3D_Scene_Data *pd, Eina_Bool _enabled) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->color_pick_enabled != _enabled) pd->color_pick_enabled = _enabled; diff --git a/src/lib/evas/canvas/evas_3d_texture.c b/src/lib/evas/canvas/evas_3d_texture.c index a324eb6..8945fad 100644 --- a/src/lib/evas/canvas/evas_3d_texture.c +++ b/src/lib/evas/canvas/evas_3d_texture.c @@ -196,7 +196,6 @@ EOLIAN static void _evas_3d_texture_evas_3d_object_change_notify(Eo *obj, Evas_3D_Texture_Data *pd, Evas_3D_State state EINA_UNUSED, Evas_3D_Object *ref EINA_UNUSED) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->materials) eina_hash_foreach(pd->materials, _texture_material_change_notify, obj); } @@ -204,7 +203,6 @@ _evas_3d_texture_evas_3d_object_change_notify(Eo *obj, Evas_3D_Texture_Data *pd, EOLIAN static void _evas_3d_texture_evas_3d_object_update_notify(Eo *obj, Evas_3D_Texture_Data *pd) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (pd->source) { Eo *evas = NULL; @@ -313,21 +311,19 @@ _evas_3d_texture_eo_base_constructor(Eo *obj, Evas_3D_Texture_Data *pd EINA_UNUS EOLIAN static void _evas_3d_texture_eo_base_destructor(Eo *obj, Evas_3D_Texture_Data *pd EINA_UNUSED) { - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); //evas_3d_object_unreference(&pd->base); _texture_fini(obj); eo_do_super(obj, MY_CLASS, eo_destructor()); } EOLIAN static void -_evas_3d_texture_data_set(Eo *obj, Evas_3D_Texture_Data *pd, Evas_3D_Color_Format color_format, +_evas_3d_texture_data_set(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd, Evas_3D_Color_Format color_format, Evas_3D_Pixel_Format pixel_format, int w, int h, const void *data) { Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (!pd->engine_data && e->engine.func->texture_new) pd->engine_data = e->engine.func->texture_new(e->engine.data.output); @@ -345,7 +341,6 @@ _evas_3d_texture_file_set(Eo *obj, Evas_3D_Texture_Data *pd, const char *file, c eo_do(obj, evas = evas_common_evas_get()); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (!pd->engine_data && e->engine.func->texture_new) pd->engine_data = e->engine.func->texture_new(e->engine.data.output); @@ -366,7 +361,6 @@ _evas_3d_texture_source_set(Eo *obj , Evas_3D_Texture_Data *pd, Evas_Object *sou if (source == pd->source) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); _texture_fini(obj); if (source == NULL) @@ -397,7 +391,7 @@ _evas_3d_texture_source_set(Eo *obj , Evas_3D_Texture_Data *pd, Evas_Object *sou } EOLIAN static void -_evas_3d_texture_source_visible_set(Eo *obj, Evas_3D_Texture_Data *pd, Eina_Bool visible) +_evas_3d_texture_source_visible_set(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd, Eina_Bool visible) { Evas_Object_Protected_Data *src_obj; @@ -409,7 +403,6 @@ _evas_3d_texture_source_visible_set(Eo *obj, Evas_3D_Texture_Data *pd, Eina_Bool if (src_obj->proxy->src_invisible == !visible) return; - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); EINA_COW_WRITE_BEGIN(evas_object_proxy_cow, src_obj->proxy, Evas_Object_Proxy_Data, proxy_write) proxy_write->src_invisible = !visible; EINA_COW_WRITE_END(evas_object_proxy_cow, src_obj->proxy, proxy_write); @@ -455,7 +448,6 @@ _evas_3d_texture_size_get(Eo *obj, Evas_3D_Texture_Data *pd, int *w, int *h) Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (e->engine.func->texture_size_get) { e->engine.func->texture_size_get(e->engine.data.output, @@ -469,7 +461,6 @@ _evas_3d_texture_wrap_set(Eo *obj, Evas_3D_Texture_Data *pd, Evas_3D_Wrap_Mode s Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (e->engine.func->texture_wrap_set) { e->engine.func->texture_wrap_set(e->engine.data.output, @@ -484,7 +475,6 @@ _evas_3d_texture_wrap_get(Eo *obj, Evas_3D_Texture_Data *pd, Evas_3D_Wrap_Mode * Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (e->engine.func->texture_wrap_set) { e->engine.func->texture_wrap_get(e->engine.data.output, @@ -498,7 +488,6 @@ _evas_3d_texture_filter_set(Eo *obj, Evas_3D_Texture_Data *pd, Evas_3D_Texture_F Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (e->engine.func->texture_filter_set) { e->engine.func->texture_filter_set(e->engine.data.output, @@ -513,7 +502,6 @@ _evas_3d_texture_filter_get(Eo *obj EINA_UNUSED, Evas_3D_Texture_Data *pd, Evas_ Eo *evas = NULL; eo_do(obj, evas = evas_common_evas_get()); Evas_Public_Data *e = eo_data_scope_get(evas, EVAS_CANVAS_CLASS); - evas_object_async_block(eo_data_scope_get(obj, EVAS_OBJECT_CLASS)); if (e->engine.func->texture_filter_get) { e->engine.func->texture_filter_get(e->engine.data.output, --
