e_comp_cdata: Remove hwc configuration

Change-Id: If23e721296a0e0d3311514be4f97ca7008cb5485

diff --git a/src/bin/compmgr/e_comp.c b/src/bin/compmgr/e_comp.c
index b4162b9aebcdb334adfc61758a681135c5774dd1..25a64678c108344318a87c101ef8ea4a1a4e8fe3 100644 (file)
--- a/src/bin/compmgr/e_comp.c
+++ b/src/bin/compmgr/e_comp.c
@@ -145,7 +145,7 @@ _e_comp_cb_update(void)
         e_comp_object_render_update_del(ec->frame);
 
         if (e_object_is_del(E_OBJECT(ec))) continue;
-        if (e_comp->hwc && e_comp_is_on_overlay(ec)) continue;
+        if (e_comp_is_on_overlay(ec)) continue;
 
         /* update client */
         e_pixmap_size_get(ec->pixmap, &pw, &ph);
@@ -335,17 +335,9 @@ e_comp_init(void)
    e_comp_object_init();
    e_comp_new();
 
-   /* conf->hwc configuration has to be check before e_comp_screen_init() */
-   if (conf->hwc)
-     e_comp->hwc = EINA_TRUE; // activate hwc policy on the primary output
-
    if (conf->avoid_afill) e_comp->avoid_afill = EINA_TRUE;
    if (conf->hwc_prefer_gbm) e_comp->hwc_prefer_gbm = EINA_TRUE;
-
-   if (e_comp->hwc)
-     {
-        if (conf->hwc_send_redraw_request) e_comp->hwc_send_redraw_request = EINA_TRUE;
-     }
+   if (conf->hwc_send_redraw_request) e_comp->hwc_send_redraw_request = EINA_TRUE;
 
    // use wl_surface instead of tbm_surface for the e_comp_wl_buffer
    if (conf->use_native_type_buffer) e_comp->use_native_type_buffer = EINA_TRUE;
@@ -1291,15 +1283,6 @@ e_comp_socket_init(const char *name)
    return EINA_TRUE;
 }
 
-/* get the hwc is configured */
-EINTERN Eina_Bool
-e_comp_hwc_is_configured(void)
-{
-   EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp, EINA_FALSE);
-
-   return e_comp->hwc;
-}
-
 /* get the hwc_send_redraw_request value */
 EINTERN Eina_Bool
 e_comp_hwc_send_redraw_request(void)

diff --git a/src/bin/compmgr/e_comp_intern.h b/src/bin/compmgr/e_comp_intern.h
index 6936d200b0463c58c6a2fec1f5967dee202a6a71..f8d5f4c32dfdc0a081f907d23324e16d26438a35 100644 (file)
--- a/src/bin/compmgr/e_comp_intern.h
+++ b/src/bin/compmgr/e_comp_intern.h
@@ -42,7 +42,6 @@ EINTERN E_Zone       *e_comp_default_zone_get(E_Comp *comp);
 
 EINTERN Eina_Bool     e_comp_socket_init(const char *name);
 
-EINTERN Eina_Bool     e_comp_hwc_is_configured(void);
 EINTERN Eina_Bool     e_comp_hwc_send_redraw_request(void);
 EINTERN Eina_Bool     e_comp_hwc_is_prefer_gbm(void);
 

diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c
index 83e8dba1df6e4fa2137e25e97e7069863a657c74..8cc1a64d99669d0af0b73e582accca74634ede12 100644 (file)
--- a/src/bin/compmgr/e_comp_object.c
+++ b/src/bin/compmgr/e_comp_object.c
@@ -339,7 +339,7 @@ _e_comp_object_cb_mirror_show(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
 
    cw->force_visible++;
 
-   if (e_comp_hwc_is_configured() && !e_comp_is_on_overlay(cw->ec))
+   if (!e_comp_is_on_overlay(cw->ec))
      e_comp_hwc_client_end(cw->ec, __FUNCTION__);
 }
 
@@ -1149,7 +1149,6 @@ _e_comp_object_pixels_noti(void *data, Evas_Object *obj EINA_UNUSED)
 
    if (e_object_is_del(E_OBJECT(ec))) return;
    if (cw->external_content) return;
-   if (!e_comp_hwc_is_configured()) return;
 
    e_comp_client_render_list_add(cw->ec);
 

diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c
index 1793efc77ce16acda4057d4bf3227f4d9d30999f..667d8cd1ff233375d551c1948538df64e67630c3 100644 (file)
--- a/src/bin/core/e_client.c
+++ b/src/bin/core/e_client.c
@@ -1376,8 +1376,7 @@ _e_client_move_begin(E_Client *ec)
           e_client_raise(ec);
      }
 
-   if (e_comp_hwc_is_configured())
-     e_comp_client_override_add(ec);
+   e_comp_client_override_add(ec);
 
    return 1;
 }
@@ -1394,8 +1393,7 @@ _e_client_move_end(E_Client *ec)
    if (ec->transformed)
      _e_client_transform_move_end(ec);
 
-   if (e_comp_hwc_is_configured())
-     e_comp_client_override_del(ec);
+   e_comp_client_override_del(ec);
 
    ecmove = NULL;
    return 1;
@@ -1767,8 +1765,7 @@ e_client_resize_end(E_Client *ec)
    if (ec->transformed)
      _e_client_transform_resize_end(ec);
 
-   if (e_comp_hwc_is_configured())
-     e_comp_client_override_del(ec);
+   e_comp_client_override_del(ec);
 
    ecresize = NULL;
 
@@ -4997,8 +4994,7 @@ e_client_resize_begin(E_Client *ec)
           e_client_raise(ec);
      }
 
-   if (e_comp_hwc_is_configured())
-     e_comp_client_override_add(ec);
+   e_comp_client_override_add(ec);
 
    return EINA_TRUE;
 error:

diff --git a/src/bin/core/e_comp_cfdata.c b/src/bin/core/e_comp_cfdata.c
index 89a8cba6954c635ec0fa656325357ec36d8657d5..17812d8fab4fc0acb8c53218ff61817e92999924 100644 (file)
--- a/src/bin/core/e_comp_cfdata.c
+++ b/src/bin/core/e_comp_cfdata.c
@@ -49,7 +49,6 @@ e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
    E_CONFIG_VAL(D, T, nocomp_fs, UCHAR);
    E_CONFIG_VAL(D, T, nocomp_use_timer, UCHAR);
    E_CONFIG_VAL(D, T, nocomp_begin_timeout, DOUBLE);
-   E_CONFIG_VAL(D, T, hwc, UCHAR);
    E_CONFIG_VAL(D, T, hwc_deactive, UCHAR);
    E_CONFIG_VAL(D, T, hwc_send_redraw_request, UCHAR);
    E_CONFIG_VAL(D, T, hwc_prefer_gbm, UCHAR);
@@ -119,7 +118,6 @@ e_comp_cfdata_config_new(void)
    cfg->nocomp_fs = 1;
    cfg->nocomp_use_timer = 0;
    cfg->nocomp_begin_timeout = 2.0;
-   cfg->hwc = 0;
    cfg->hwc_deactive = 0;
    cfg->hwc_send_redraw_request = 0;
    cfg->hwc_prefer_gbm = 0;
@@ -544,18 +542,6 @@ e_comp_config_nocomp_begin_timeout_set(double nocomp_begin_timeout)
    e_comp_config_get()->nocomp_begin_timeout = nocomp_begin_timeout;
 }
 
-E_API unsigned char
-e_comp_config_hwc_get(void)
-{
-   return e_comp_config_get()->hwc;
-}
-
-E_API void
-e_comp_config_hwc_set(unsigned char hwc)
-{
-   e_comp_config_get()->hwc = hwc;
-}
-
 E_API unsigned char
 e_comp_config_hwc_deactive_get(void)
 {

diff --git a/src/bin/debug/e_info_client.c b/src/bin/debug/e_info_client.c
index 9193fbfaa02ca521703e8140ee9e1289229d29dd..6243453f3b89c75f8407a1c719f11307df2b41f7 100644 (file)
--- a/src/bin/debug/e_info_client.c
+++ b/src/bin/debug/e_info_client.c
@@ -20,7 +20,7 @@ typedef struct _E_Info_Client
    Eldbus_Object     *obj;
 
    /* topvwins */
-   int                use_gl, use_hwc, hwc;
+   int                use_gl;
    int                use_buffer_flush, deiconify_approve;
    int                config_engine;
    const char        *engine;
@@ -560,7 +560,7 @@ _cb_window_info_get(const Eldbus_Message *msg)
    res = eldbus_message_error_get(msg, &name, &text);
    EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
-   res = eldbus_message_arguments_get(msg, "ia("VALUE_TYPE_FOR_TOPVWINS")", &e_info_client.hwc, &array);
+   res = eldbus_message_arguments_get(msg, "a("VALUE_TYPE_FOR_TOPVWINS")", &array);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
 
    _e_win_info_make_array(array);
@@ -604,9 +604,8 @@ _cb_vwindow_info_get(const Eldbus_Message *msg)
    res = eldbus_message_error_get(msg, &name, &text);
    EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
-   res = eldbus_message_arguments_get(msg, "iiisiiia("VALUE_TYPE_FOR_TOPVWINS")",
-                                      &e_info_client.use_gl, &e_info_client.use_hwc,
-                                      &e_info_client.hwc,
+   res = eldbus_message_arguments_get(msg, "isiiia("VALUE_TYPE_FOR_TOPVWINS")",
+                                      &e_info_client.use_gl,
                                       &engine, &e_info_client.config_engine,
                                       &e_info_client.use_buffer_flush, &e_info_client.deiconify_approve,
                                       &array);
@@ -1108,7 +1107,7 @@ _cb_vec_info_get(const Eldbus_Message *msg)
    res = eldbus_message_error_get(msg, &name, &text);
    EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
-   res = eldbus_message_arguments_get(msg, "ia("VALUE_TYPE_FOR_TOPVWINS")", &e_info_client.hwc, &array);
+   res = eldbus_message_arguments_get(msg, "a("VALUE_TYPE_FOR_TOPVWINS")", &array);
    EINA_SAFETY_ON_FALSE_GOTO(res, finish);
 
    _e_win_info_make_array(array);
@@ -1228,15 +1227,6 @@ _e_info_client_proc_topvwins_info(int argc, char **argv)
 
    printf("GL :  %s\n", e_info_client.use_gl ? "on":"off");
    printf("ENG:  %s (config: %d)\n", e_info_client.engine, e_info_client.config_engine);
-   if (e_info_client.use_hwc)
-     {
-        if (e_info_client.hwc)
-          printf("HWC:  hwc windows policy\n");
-        else
-          printf("HWC:  off");
-     }
-   else
-     printf("HWC:  configuration is off");
 
    printf("Buffer flush: %s\n", e_info_client.use_buffer_flush ? "on":"off");
    if (e_info_client.use_buffer_flush)
@@ -4026,21 +4016,14 @@ _e_info_client_cb_wininfo(const Eldbus_Message *msg)
           focused, opaque, obscured, iconic, visible ? "Visible" : "Not visible",
           frame_visible, redirected ? "yes" : "no", layer_name);
    printf("   HWC_ST:");
-   if (e_info_client.hwc)
+   switch(pl_zpos)
      {
-        switch(pl_zpos)
-          {
-           case E_HWC_WINDOW_STATE_NONE:   printf("  NO  "); break;
-           case E_HWC_WINDOW_STATE_CLIENT: printf("  CL  "); break;
-           case E_HWC_WINDOW_STATE_DEVICE: printf("  DV  "); break;
-           case E_HWC_WINDOW_STATE_VIDEO:  printf("  VD  "); break;
-           case E_HWC_WINDOW_STATE_CURSOR: printf("  CS  "); break;
-           default:                        printf("  -  "); break;
-          }
-     }
-   else
-     {
-        printf(" - \n");
+      case E_HWC_WINDOW_STATE_NONE:   printf("  NO  "); break;
+      case E_HWC_WINDOW_STATE_CLIENT: printf("  CL  "); break;
+      case E_HWC_WINDOW_STATE_DEVICE: printf("  DV  "); break;
+      case E_HWC_WINDOW_STATE_VIDEO:  printf("  VD  "); break;
+      case E_HWC_WINDOW_STATE_CURSOR: printf("  CS  "); break;
+      default:                        printf("  -  "); break;
      }
 
    printf ("   Corners:  +%d+%d  -%d+%d  -%d-%d  +%d-%d\n",
@@ -5278,9 +5261,8 @@ _cb_view_info_get(const Eldbus_Message *msg)
    res = eldbus_message_error_get(msg, &name, &text);
    EINA_SAFETY_ON_TRUE_GOTO(res, finish);
 
-   res = eldbus_message_arguments_get(msg, "iiisiiia("VALUE_TYPE_FOR_TOPVWINS")",
-                                      &e_info_client.use_gl, &e_info_client.use_hwc,
-                                      &e_info_client.hwc,
+   res = eldbus_message_arguments_get(msg, "isiiia("VALUE_TYPE_FOR_TOPVWINS")",
+                                      &e_info_client.use_gl,
                                       &engine, &e_info_client.config_engine,
                                       &e_info_client.use_buffer_flush, &e_info_client.deiconify_approve,
                                       &array);
@@ -5318,15 +5300,6 @@ _e_info_client_proc_view_info(int argc, char **argv)
 
    printf("GL :  %s\n", e_info_client.use_gl ? "on":"off");
    printf("ENG:  %s (config: %d)\n", e_info_client.engine, e_info_client.config_engine);
-   if (e_info_client.use_hwc)
-     {
-        if (e_info_client.hwc)
-          printf("HWC:  hwc windows policy\n");
-        else
-          printf("HWC:  off");
-     }
-   else
-     printf("HWC:  configuration is off");
 
    printf("Buffer flush: %s\n", e_info_client.use_buffer_flush ? "on":"off");
    if (e_info_client.use_buffer_flush)

diff --git a/src/bin/debug/e_info_server.c b/src/bin/debug/e_info_server.c
index 7f3cda77b88a2c6df7bde7767c159f76471592df..eb0242a3747474e023f03f5529721fa6f9246113 100644 (file)
--- a/src/bin/debug/e_info_server.c
+++ b/src/bin/debug/e_info_server.c
@@ -244,7 +244,7 @@ _e_info_server_ec_hwc_info_get(E_Client *ec, int *hwc, int *hwc_policy, int *pl_
    *hwc = -1;
    *pl_zpos = -999;
 
-   if ((!e_comp_hwc_is_configured()) || e_comp_hwc_deactive_get())
+   if (e_comp_hwc_deactive_get())
      return;
 
    *hwc = 0;
@@ -514,8 +514,6 @@ _e_info_server_cb_window_info_get(const Eldbus_Service_Interface *iface EINA_UNU
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(reply);
 
    eldbus_message_iter_basic_append(iter, 'i', e_comp_gl_get());
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->hwc);
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_hwc_is_configured());
    eldbus_message_iter_basic_append(iter, 's', ecore_evas_engine_name_get(e_comp_ee_get()));
    eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->engine);
    eldbus_message_iter_basic_append(iter, 'i', e_config->use_buffer_flush);
@@ -533,8 +531,6 @@ _e_info_server_cb_ec_info_get(const Eldbus_Service_Interface *iface EINA_UNUSED,
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(reply);
 
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_hwc_is_configured());
-
    _msg_ecs_append(iter, EINA_TRUE);
 
    return reply;
@@ -545,8 +541,6 @@ _e_info_server_cb_all_ec_info_get(const Eldbus_Service_Interface *iface EINA_UNU
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(reply);
 
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_hwc_is_configured());
-
    _msg_ecs_append(iter, EINA_FALSE);
 
    return reply;
@@ -559,8 +553,6 @@ _e_info_server_cb_all_window_info_get(const Eldbus_Service_Interface *iface EINA
    Eldbus_Message *reply = eldbus_message_method_return_new(msg);
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(reply);
 
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_hwc_is_configured());
-
    _msg_clients_append(iter, EINA_FALSE);
 
    return reply;
@@ -4580,12 +4572,6 @@ e_info_server_cb_hwc(const Eldbus_Service_Interface *iface EINA_UNUSED, const El
         return reply;
      }
 
-   if (!e_comp_hwc_is_configured())
-     {
-        ERR("Error HWC is not initialized.");
-        return reply;
-     }
-
    EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp_get(), reply);
    EINA_SAFETY_ON_NULL_RETURN_VAL(e_comp_screen_get(), reply);
 
@@ -6563,8 +6549,6 @@ _e_info_server_cb_view_info_get(const Eldbus_Service_Interface *iface EINA_UNUSE
    Eldbus_Message_Iter *iter = eldbus_message_iter_get(reply);
 
    eldbus_message_iter_basic_append(iter, 'i', e_comp_gl_get());
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->hwc);
-   eldbus_message_iter_basic_append(iter, 'i', e_comp_hwc_is_configured());
    eldbus_message_iter_basic_append(iter, 's', ecore_evas_engine_name_get(e_comp_ee_get()));
    eldbus_message_iter_basic_append(iter, 'i', e_comp_config_get()->engine);
    eldbus_message_iter_basic_append(iter, 'i', e_config->use_buffer_flush);
@@ -7579,10 +7563,10 @@ finish:
 
 //{ "method_name", arguments_from_client, return_values_to_client, _method_cb, ELDBUS_METHOD_FLAG },
 static const Eldbus_Method methods[] = {
-   { "get_window_info", NULL, ELDBUS_ARGS({"iiisiiia("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_window_info_get, 0 },
-   { "get_ec_info", NULL, ELDBUS_ARGS({"ia("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}),_e_info_server_cb_ec_info_get, 0 },
-   { "get_all_ec_info", NULL, ELDBUS_ARGS({"ia("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}),_e_info_server_cb_all_ec_info_get, 0 },
-   { "get_all_window_info", NULL, ELDBUS_ARGS({"ia("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_all_window_info_get, 0 },
+   { "get_window_info", NULL, ELDBUS_ARGS({"isiiia("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_window_info_get, 0 },
+   { "get_ec_info", NULL, ELDBUS_ARGS({"a("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}),_e_info_server_cb_ec_info_get, 0 },
+   { "get_all_ec_info", NULL, ELDBUS_ARGS({"a("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}),_e_info_server_cb_all_ec_info_get, 0 },
+   { "get_all_window_info", NULL, ELDBUS_ARGS({"a("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_all_window_info_get, 0 },
    { "get_zone_info", NULL, ELDBUS_ARGS({"("VALUE_TYPE_FOR_ZONE")", "array of zone"}), _e_info_server_cb_zone_info_get, 0 },
    { "compobjs", NULL, ELDBUS_ARGS({"a("SIGNATURE_COMPOBJS_CLIENT")", "array of comp objs"}), _e_info_server_cb_compobjs, 0 },
    { "subsurface", NULL, ELDBUS_ARGS({"a("SIGNATURE_SUBSURFACE")", "array of ec"}), _e_info_server_cb_subsurface, 0 },
@@ -7653,7 +7637,7 @@ static const Eldbus_Method methods[] = {
    { "input_region", ELDBUS_ARGS({"siiii", "options"}), ELDBUS_ARGS({"a(iiii)", "path"}), _e_info_server_cb_input_region, 0},
    { "hwc_wins", ELDBUS_ARGS({"i", "option"}), ELDBUS_ARGS({"as", "hwc wins info"}), _e_info_server_cb_hwc_wins_info_get, 0 },
    { "screen_info", ELDBUS_ARGS({"i", "option"}), ELDBUS_ARGS({"as", "screen info"}), _e_info_server_cb_screen_info_get, 0 },
-   { "view_info", NULL, ELDBUS_ARGS({"iiisiiia("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_view_info_get, 0 },
+   { "view_info", NULL, ELDBUS_ARGS({"isiiia("VALUE_TYPE_FOR_TOPVWINS")", "array of ec"}), _e_info_server_cb_view_info_get, 0 },
    { "focus_policy_ext_set", ELDBUS_ARGS({"i", "option"}), ELDBUS_ARGS({"bi", "isChanged and result"}), _e_info_server_cb_focus_policy_ext_set, 0 },
    { "focus_history", NULL, ELDBUS_ARGS({"a(ubbbs)", "history array"}), _e_info_server_cb_focus_history, 0 },
    { "init_device", ELDBUS_ARGS({"us", "device information"}), ELDBUS_ARGS({"s", "result message"}), _e_info_server_cb_init_device, 0},

diff --git a/src/bin/debug/e_test_helper.c b/src/bin/debug/e_test_helper.c
index 39871457437c8c5cc3805bce8c3c2d098a8d604e..90402acc9ee62027d56f9974d5a8a16da483dd1a 100644 (file)
--- a/src/bin/debug/e_test_helper.c
+++ b/src/bin/debug/e_test_helper.c
@@ -921,14 +921,11 @@ _e_test_helper_cb_hwc(const Eldbus_Service_Interface *iface, const Eldbus_Messag
    r = eldbus_message_arguments_get(msg, "u", &on);
    EINA_SAFETY_ON_FALSE_RETURN_VAL(r, reply);
 
-   if (e_comp_hwc_is_configured())
+   switch (on)
      {
-        switch (on)
-          {
-           case 0: accept = EINA_TRUE; e_comp_hwc_deactive_set(EINA_TRUE); break;
-           case 1: accept = EINA_TRUE; e_comp_hwc_deactive_set(EINA_FALSE); break;
-           default: break;
-          }
+      case 0: accept = EINA_TRUE; e_comp_hwc_deactive_set(EINA_TRUE); break;
+      case 1: accept = EINA_TRUE; e_comp_hwc_deactive_set(EINA_FALSE); break;
+      default: break;
      }
 
    eldbus_message_arguments_append(reply, "b", accept);

diff --git a/src/bin/displaymgr/e_hwc.c b/src/bin/displaymgr/e_hwc.c
index 6a112f231f60623884c6e8246bf1b447440fafd4..40ccdeba76372f25a9bf1668a0f61a767c879a8c 100644 (file)
--- a/src/bin/displaymgr/e_hwc.c
+++ b/src/bin/displaymgr/e_hwc.c
@@ -191,7 +191,7 @@ e_hwc_new(E_Output *output, Eina_Bool primary_output)
           }
      }
 
-   if (e_comp_hwc_is_configured() && e_comp_conf_hwc_deactive_get())
+   if (e_comp_conf_hwc_deactive_get())
      e_hwc_deactive_set(hwc, EINA_TRUE);
 
    /* default active hwc */

diff --git a/src/include/e_comp.h b/src/include/e_comp.h
index c0d4ad4ca23b6000e2cb2963b9e28fafa010499a..1b958b13e808f66066468056e8df48d31e772115 100644 (file)
--- a/src/include/e_comp.h
+++ b/src/include/e_comp.h
@@ -110,7 +110,6 @@ struct _E_Comp
 
    Ecore_Timer    *nocomp_override_timer;
    int             nocomp_override; //number of times hwc override has been requested
-   Eina_Bool       hwc : 1;
    Eina_Bool       hwc_send_redraw_request;
    Eina_Bool       hwc_prefer_gbm;
    Eina_Bool       use_native_type_buffer : 1; // use native buffer type

diff --git a/src/include/e_comp_cfdata.h b/src/include/e_comp_cfdata.h
index 3771a7eede52212950b5c0787122b2ab0248240a..bdcaf7a4115ecf851955aaaf1e1801025ac27ba3 100644 (file)
--- a/src/include/e_comp_cfdata.h
+++ b/src/include/e_comp_cfdata.h
@@ -32,7 +32,6 @@ struct _E_Comp_Config
    unsigned char nocomp_fs;
    unsigned char nocomp_use_timer;
    double        nocomp_begin_timeout;
-   unsigned char hwc;
    unsigned char hwc_deactive; // 0: run hwc policy if capable of, 1: not to run hwc policy
    unsigned char hwc_send_redraw_request; // 0: none, 1: send redraw request to client when client need to redraw for hwc
    unsigned char hwc_prefer_gbm; //0: prefer creating ecore_evas with tbm, 1: prefer creating ecore_evas with gbm