summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-04-12 13:44:10 -0500
committerDerek Foreman <derekf@osg.samsung.com>2018-04-12 14:33:14 -0500
commita52941cc3dcbe6111c90cfded3b1a8147c04eb83 (patch)
tree2517b5b05a157e62cbfd42666381ab56480a911d
parentffeb018fd57cd6d509006b326b7065bf67dd364f (diff)
ee_wayland: Stop using manual_render_setdevs/derekf/no_more_manual_render
Now we use draw_block instead, so we don't accidentally stomp on other code's usage of manual_render_set fix T6834
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index cf32ffa197..bf998f0b0f 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -59,7 +59,7 @@ _ecore_evas_wl_common_animator_register(Ecore_Evas *ee)
59 edata->frame = ecore_wl2_window_frame_callback_add(edata->win, 59 edata->frame = ecore_wl2_window_frame_callback_add(edata->win,
60 _anim_cb_tick, ee); 60 _anim_cb_tick, ee);
61 if (!ecore_wl2_window_pending_get(edata->win) && !ee->in_async_render && 61 if (!ecore_wl2_window_pending_get(edata->win) && !ee->in_async_render &&
62 !ee->animator_ticked && !ee->animator_ran) 62 !ee->animator_ticked && !ee->animator_ran && !ee->draw_block)
63 ecore_wl2_window_false_commit(edata->win); 63 ecore_wl2_window_false_commit(edata->win);
64 edata->ticking = EINA_TRUE; 64 edata->ticking = EINA_TRUE;
65} 65}
@@ -212,7 +212,7 @@ _ecore_evas_wl_common_cb_disconnect(void *data EINA_UNUSED, int type EINA_UNUSED
212 wdata->defer_show = EINA_TRUE; 212 wdata->defer_show = EINA_TRUE;
213 ee->visible = EINA_FALSE; 213 ee->visible = EINA_FALSE;
214 wdata->reset_pending = 1; 214 wdata->reset_pending = 1;
215 ecore_evas_manual_render_set(ee, 1); 215 ee->draw_block = EINA_TRUE;
216 _ee_display_unset(ee); 216 _ee_display_unset(ee);
217 } 217 }
218 return ECORE_CALLBACK_RENEW; 218 return ECORE_CALLBACK_RENEW;
@@ -625,8 +625,8 @@ _ecore_evas_wl_common_cb_window_configure_complete(void *data EINA_UNUSED, int t
625 ERR("Failed to set Evas Engine Info for '%s'", ee->driver); 625 ERR("Failed to set Evas Engine Info for '%s'", ee->driver);
626 626
627 wdata = ee->engine.data; 627 wdata = ee->engine.data;
628 ee->draw_block = EINA_FALSE;
628 if (wdata->frame) ecore_evas_manual_render(ee); 629 if (wdata->frame) ecore_evas_manual_render(ee);
629 ecore_evas_manual_render_set(ee, 0);
630 630
631 return ECORE_CALLBACK_PASS_ON; 631 return ECORE_CALLBACK_PASS_ON;
632} 632}
@@ -2250,7 +2250,7 @@ _ee_cb_sync_done(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
2250 2250
2251 if (wdata->reset_pending) 2251 if (wdata->reset_pending)
2252 { 2252 {
2253 ecore_evas_manual_render_set(ee, 0); 2253 ee->draw_block = EINA_FALSE;
2254 } 2254 }
2255 if (evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo)) 2255 if (evas_engine_info_set(ee->evas, (Evas_Engine_Info *)einfo))
2256 { 2256 {
@@ -2580,7 +2580,7 @@ _ecore_evas_wl_common_new_internal(const char *disp_name, unsigned int parent, i
2580 2580
2581 ee_list = eina_list_append(ee_list, ee); 2581 ee_list = eina_list_append(ee_list, ee);
2582 2582
2583 ecore_evas_manual_render_set(ee, 1); 2583 ee->draw_block = EINA_TRUE;
2584 2584
2585 return ee; 2585 return ee;
2586 2586