expose dither option for comp - on by default
This commit is contained in:
parent
e2786dd50f
commit
a9890ce7b6
|
@ -1239,6 +1239,11 @@ e_comp_init(void)
|
||||||
conf->version = E_COMP_VERSION;
|
conf->version = E_COMP_VERSION;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (conf->no_dither)
|
||||||
|
e_util_env_set("EVAS_GL_RENDER_DISABLE_DITHER", "1");
|
||||||
|
else
|
||||||
|
e_util_env_set("EVAS_GL_RENDER_DISABLE_DITHER", NULL);
|
||||||
|
|
||||||
{
|
{
|
||||||
E_Action *act;
|
E_Action *act;
|
||||||
|
|
||||||
|
|
|
@ -44,6 +44,7 @@ e_comp_cfdata_edd_init(E_Config_DD **conf_edd, E_Config_DD **match_edd)
|
||||||
// E_CONFIG_VAL(D, T, lock_fps, UCHAR);
|
// E_CONFIG_VAL(D, T, lock_fps, UCHAR);
|
||||||
E_CONFIG_VAL(D, T, grab, UCHAR);
|
E_CONFIG_VAL(D, T, grab, UCHAR);
|
||||||
E_CONFIG_VAL(D, T, vsync, UCHAR);
|
E_CONFIG_VAL(D, T, vsync, UCHAR);
|
||||||
|
E_CONFIG_VAL(D, T, no_dither, UCHAR);
|
||||||
E_CONFIG_VAL(D, T, swap_mode, UCHAR);
|
E_CONFIG_VAL(D, T, swap_mode, UCHAR);
|
||||||
//E_CONFIG_VAL(D, T, keep_unmapped, UCHAR);
|
//E_CONFIG_VAL(D, T, keep_unmapped, UCHAR);
|
||||||
E_CONFIG_VAL(D, T, send_flush, UCHAR);
|
E_CONFIG_VAL(D, T, send_flush, UCHAR);
|
||||||
|
@ -80,6 +81,7 @@ e_comp_cfdata_config_new(void)
|
||||||
// cfg->lock_fps = 0;
|
// cfg->lock_fps = 0;
|
||||||
cfg->grab = 0;
|
cfg->grab = 0;
|
||||||
cfg->vsync = 1;
|
cfg->vsync = 1;
|
||||||
|
cfg->no_dither = 0;
|
||||||
#ifdef ECORE_EVAS_GL_X11_OPT_SWAP_MODE
|
#ifdef ECORE_EVAS_GL_X11_OPT_SWAP_MODE
|
||||||
cfg->swap_mode = ECORE_EVAS_GL_X11_SWAP_MODE_AUTO;
|
cfg->swap_mode = ECORE_EVAS_GL_X11_SWAP_MODE_AUTO;
|
||||||
#else
|
#else
|
||||||
|
|
|
@ -22,6 +22,7 @@ struct _E_Comp_Config
|
||||||
unsigned char grab;
|
unsigned char grab;
|
||||||
unsigned char vsync;
|
unsigned char vsync;
|
||||||
unsigned char swap_mode;
|
unsigned char swap_mode;
|
||||||
|
unsigned char no_dither;
|
||||||
unsigned char keep_unmapped;
|
unsigned char keep_unmapped;
|
||||||
unsigned char send_flush;
|
unsigned char send_flush;
|
||||||
unsigned char send_dump;
|
unsigned char send_dump;
|
||||||
|
|
|
@ -8,6 +8,7 @@ struct _E_Config_Dialog_Data
|
||||||
int smooth_windows;
|
int smooth_windows;
|
||||||
int grab;
|
int grab;
|
||||||
int vsync;
|
int vsync;
|
||||||
|
int dither;
|
||||||
int swap_mode;
|
int swap_mode;
|
||||||
|
|
||||||
const char *shadow_style;
|
const char *shadow_style;
|
||||||
|
@ -25,6 +26,7 @@ struct _E_Config_Dialog_Data
|
||||||
|
|
||||||
Evas_Object *styles_il;
|
Evas_Object *styles_il;
|
||||||
Evas_Object *vsync_check;
|
Evas_Object *vsync_check;
|
||||||
|
Evas_Object *dither_check;
|
||||||
Evas_Object *texture_check;
|
Evas_Object *texture_check;
|
||||||
|
|
||||||
Evas_Object *swap_auto_radio;
|
Evas_Object *swap_auto_radio;
|
||||||
|
@ -104,6 +106,7 @@ _create_data(E_Config_Dialog *cfd EINA_UNUSED)
|
||||||
cfdata->smooth_windows = conf->smooth_windows;
|
cfdata->smooth_windows = conf->smooth_windows;
|
||||||
cfdata->grab = conf->grab;
|
cfdata->grab = conf->grab;
|
||||||
cfdata->vsync = conf->vsync;
|
cfdata->vsync = conf->vsync;
|
||||||
|
cfdata->dither = !(!!conf->no_dither);
|
||||||
cfdata->swap_mode = conf->swap_mode;
|
cfdata->swap_mode = conf->swap_mode;
|
||||||
cfdata->shadow_style = eina_stringshare_add(conf->shadow_style);
|
cfdata->shadow_style = eina_stringshare_add(conf->shadow_style);
|
||||||
|
|
||||||
|
@ -131,6 +134,8 @@ _comp_engine_toggle(void *data, Evas_Object *o EINA_UNUSED, void *event EINA_UNU
|
||||||
|
|
||||||
e_widget_disabled_set(cfdata->vsync_check,
|
e_widget_disabled_set(cfdata->vsync_check,
|
||||||
(cfdata->engine == E_COMP_ENGINE_SW));
|
(cfdata->engine == E_COMP_ENGINE_SW));
|
||||||
|
e_widget_disabled_set(cfdata->dither_check,
|
||||||
|
(cfdata->engine == E_COMP_ENGINE_SW));
|
||||||
|
|
||||||
if (cfdata->texture_check)
|
if (cfdata->texture_check)
|
||||||
e_widget_disabled_set(cfdata->texture_check,
|
e_widget_disabled_set(cfdata->texture_check,
|
||||||
|
@ -284,7 +289,12 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
|
||||||
// e_widget_framelist_object_append(of, ob);
|
// e_widget_framelist_object_append(of, ob);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
ob = e_widget_check_add(evas, _("Dithering"), &(cfdata->dither));
|
||||||
|
e_widget_framelist_object_append(of, ob);
|
||||||
|
cfdata->dither_check = ob;
|
||||||
|
e_widget_disabled_set(ob, (cfdata->engine == E_COMP_ENGINE_SW));
|
||||||
e_widget_list_object_append(ol, of, 1, 1, 0.5);
|
e_widget_list_object_append(ol, of, 1, 1, 0.5);
|
||||||
|
|
||||||
e_widget_toolbook_page_append(otb, NULL, _("Rendering"), ol, 0, 0, 0, 0, 0.5, 0.0);
|
e_widget_toolbook_page_append(otb, NULL, _("Rendering"), ol, 0, 0, 0, 0, 0.5, 0.0);
|
||||||
|
|
||||||
///////////////////////////////////////////
|
///////////////////////////////////////////
|
||||||
|
@ -433,6 +443,7 @@ _advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED,
|
||||||
(cfdata->indirect != conf->indirect) ||
|
(cfdata->indirect != conf->indirect) ||
|
||||||
(cfdata->texture_from_pixmap != conf->texture_from_pixmap) ||
|
(cfdata->texture_from_pixmap != conf->texture_from_pixmap) ||
|
||||||
(cfdata->vsync != conf->vsync) ||
|
(cfdata->vsync != conf->vsync) ||
|
||||||
|
(cfdata->dither != !(!!conf->no_dither)) ||
|
||||||
(cfdata->swap_mode != conf->swap_mode))
|
(cfdata->swap_mode != conf->swap_mode))
|
||||||
{
|
{
|
||||||
E_Action *a;
|
E_Action *a;
|
||||||
|
@ -441,6 +452,7 @@ _advanced_apply_data(E_Config_Dialog *cfd EINA_UNUSED,
|
||||||
conf->indirect = cfdata->indirect;
|
conf->indirect = cfdata->indirect;
|
||||||
conf->texture_from_pixmap = cfdata->texture_from_pixmap;
|
conf->texture_from_pixmap = cfdata->texture_from_pixmap;
|
||||||
conf->vsync = cfdata->vsync;
|
conf->vsync = cfdata->vsync;
|
||||||
|
conf->no_dither = !(!!cfdata->dither);
|
||||||
conf->swap_mode = cfdata->swap_mode;
|
conf->swap_mode = cfdata->swap_mode;
|
||||||
|
|
||||||
a = e_action_find("restart");
|
a = e_action_find("restart");
|
||||||
|
@ -502,6 +514,10 @@ _basic_create_widgets(E_Config_Dialog *cfd,
|
||||||
cfdata->vsync_check = ob;
|
cfdata->vsync_check = ob;
|
||||||
e_widget_disabled_set(ob, (cfdata->engine == E_COMP_ENGINE_SW));
|
e_widget_disabled_set(ob, (cfdata->engine == E_COMP_ENGINE_SW));
|
||||||
}
|
}
|
||||||
|
ob = e_widget_check_add(evas, _("Dithering"), &(cfdata->dither));
|
||||||
|
e_widget_framelist_object_append(of, ob);
|
||||||
|
cfdata->dither_check = ob;
|
||||||
|
e_widget_disabled_set(ob, (cfdata->engine == E_COMP_ENGINE_SW));
|
||||||
|
|
||||||
ob = e_widget_check_add(evas, _("Smooth scaling of window content"), &(cfdata->smooth_windows));
|
ob = e_widget_check_add(evas, _("Smooth scaling of window content"), &(cfdata->smooth_windows));
|
||||||
e_widget_framelist_object_append(of, ob);
|
e_widget_framelist_object_append(of, ob);
|
||||||
|
@ -582,7 +598,8 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED,
|
||||||
if ((cfdata->engine != conf->engine) ||
|
if ((cfdata->engine != conf->engine) ||
|
||||||
(cfdata->indirect != conf->indirect) ||
|
(cfdata->indirect != conf->indirect) ||
|
||||||
(cfdata->texture_from_pixmap != conf->texture_from_pixmap) ||
|
(cfdata->texture_from_pixmap != conf->texture_from_pixmap) ||
|
||||||
(cfdata->vsync != conf->vsync))
|
(cfdata->vsync != conf->vsync) ||
|
||||||
|
(cfdata->dither != !(!!conf->no_dither)))
|
||||||
{
|
{
|
||||||
E_Action *a;
|
E_Action *a;
|
||||||
|
|
||||||
|
@ -590,6 +607,7 @@ _basic_apply_data(E_Config_Dialog *cfd EINA_UNUSED,
|
||||||
conf->indirect = cfdata->indirect;
|
conf->indirect = cfdata->indirect;
|
||||||
conf->texture_from_pixmap = cfdata->texture_from_pixmap;
|
conf->texture_from_pixmap = cfdata->texture_from_pixmap;
|
||||||
conf->vsync = cfdata->vsync;
|
conf->vsync = cfdata->vsync;
|
||||||
|
conf->no_dither = !(!!cfdata->dither);
|
||||||
|
|
||||||
a = e_action_find("restart");
|
a = e_action_find("restart");
|
||||||
if ((a) && (a->func.go)) a->func.go(NULL, NULL);
|
if ((a) && (a->func.go)) a->func.go(NULL, NULL);
|
||||||
|
|
Loading…
Reference in New Issue