From e1dd3be7d7476623f26fdb39121a0271ac798dd3 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 24 Mar 2020 19:12:21 +0900 Subject: [PATCH] e_output: do not deactivate hwc by applying mask object for stream capture. Image mask functionality is actually for -dump_video option of enlightenment_info. Since the usage of -dump_video option is for debugging, if deactivate hwc then it can hide a defect about hwc issue. Change-Id: Ic0eef39a71c241059ae16ff5615b643acb033e12 --- src/bin/e_output.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/bin/e_output.c b/src/bin/e_output.c index d5b9348317..0e4c6559c6 100644 --- a/src/bin/e_output.c +++ b/src/bin/e_output.c @@ -53,7 +53,6 @@ struct _E_Output_Stream_Capture_Mask_Data Evas_Object *eo; Eina_Stringshare *file; Eina_Rectangle geometry; - Eina_Bool saved_hwc_deactive; }; static int _e_output_hooks_delete = 0; @@ -4429,7 +4428,6 @@ _e_output_stream_capture_mask_image_activate(E_Output *output) E_Output_Stream_Capture_Mask_Data *md; Evas_Object *eo; Evas_Load_Error err; - Eina_Bool hwc_deactive; md = eina_hash_find(_mask_data_hash, &output); if (!md) @@ -4473,16 +4471,6 @@ _e_output_stream_capture_mask_image_activate(E_Output *output) evas_object_show(eo); md->eo = eo; - - /* Deactive HWC to display mask image on evas. it's saved for restoring. - * - * WARNING: Restoring deactive status won't work as expected if deactive - * status of HWC changes after it. It may cause undefined behavior. */ - hwc_deactive = e_hwc_deactive_get(output->hwc); - if (!hwc_deactive) - e_hwc_deactive_set(output->hwc, EINA_TRUE); - - md->saved_hwc_deactive = hwc_deactive; } static void @@ -4498,8 +4486,4 @@ _e_output_stream_capture_mask_image_deactivate(E_Output *output) } E_FREE_FUNC(md->eo, evas_object_del); - - /* restore hwc deactive status. */ - if (!md->saved_hwc_deactive) - e_hwc_deactive_set(output->hwc, EINA_FALSE); } -- 2.34.1