Add easy way to enable/disable shaders
This commit is contained in:
parent
14bd37415b
commit
18fd85de24
|
@ -3750,3 +3750,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -4764,3 +4764,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3522,3 +3522,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3651,3 +3651,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -7728,3 +7728,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3410,3 +3410,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -7880,3 +7880,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -8657,3 +8657,5 @@ MSG_HASH(
|
||||||
MENU_ENUM_SUBLABEL_LOG_DIR,
|
MENU_ENUM_SUBLABEL_LOG_DIR,
|
||||||
"Les fichiers de journalisation des événements système seront conservés dans ce dossier."
|
"Les fichiers de journalisation des événements système seront conservés dans ce dossier."
|
||||||
)
|
)
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3635,3 +3635,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -4204,3 +4204,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3503,3 +3503,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -1841,3 +1841,5 @@ MSG_HASH(MENU_ENUM_LABEL_LOG_DIR,
|
||||||
"log_dir")
|
"log_dir")
|
||||||
MSG_HASH(MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_MENU_WIDGETS_ENABLE,
|
||||||
"menu_widgets_enable")
|
"menu_widgets_enable")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADERS_ENABLE,
|
||||||
|
"video_shader_enable")
|
||||||
|
|
|
@ -3404,3 +3404,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3800,3 +3800,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu widgetów")
|
"Menu widgetów")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -8032,3 +8032,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3476,3 +3476,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3679,3 +3679,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -8548,3 +8548,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -8663,3 +8663,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -3566,3 +3566,5 @@ MSG_HASH(
|
||||||
)
|
)
|
||||||
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WIDGETS_ENABLE,
|
||||||
"Menu Widgets")
|
"Menu Widgets")
|
||||||
|
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
"Video Shaders")
|
||||||
|
|
|
@ -4718,7 +4718,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
|
||||||
unsigned i;
|
unsigned i;
|
||||||
struct video_shader *shader = menu_shader_get();
|
struct video_shader *shader = menu_shader_get();
|
||||||
unsigned pass_count = shader ? shader->passes : 0;
|
unsigned pass_count = shader ? shader->passes : 0;
|
||||||
|
settings_t *settings = config_get_ptr();
|
||||||
|
|
||||||
|
if (menu_displaylist_parse_settings_enum(info->list,
|
||||||
|
MENU_ENUM_LABEL_VIDEO_SHADERS_ENABLE,
|
||||||
|
PARSE_ONLY_BOOL, false) == 0)
|
||||||
|
count++;
|
||||||
|
|
||||||
|
if (settings->bools.video_shader_enable)
|
||||||
|
{
|
||||||
if (menu_entries_append_enum(info->list,
|
if (menu_entries_append_enum(info->list,
|
||||||
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES),
|
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES),
|
||||||
msg_hash_to_str(MENU_ENUM_LABEL_SHADER_APPLY_CHANGES),
|
msg_hash_to_str(MENU_ENUM_LABEL_SHADER_APPLY_CHANGES),
|
||||||
|
@ -4809,6 +4817,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
|
||||||
count++;
|
count++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (count == 0)
|
if (count == 0)
|
||||||
menu_entries_append_enum(info->list,
|
menu_entries_append_enum(info->list,
|
||||||
|
|
|
@ -62,6 +62,7 @@
|
||||||
#include "menu_driver.h"
|
#include "menu_driver.h"
|
||||||
#include "menu_animation.h"
|
#include "menu_animation.h"
|
||||||
#include "menu_input.h"
|
#include "menu_input.h"
|
||||||
|
#include "menu_shader.h"
|
||||||
#include "widgets/menu_input_dialog.h"
|
#include "widgets/menu_input_dialog.h"
|
||||||
#include "widgets/menu_input_bind_dialog.h"
|
#include "widgets/menu_input_bind_dialog.h"
|
||||||
|
|
||||||
|
@ -5574,6 +5575,28 @@ void general_write_handler(rarch_setting_t *setting)
|
||||||
|
|
||||||
switch (setting->enum_idx)
|
switch (setting->enum_idx)
|
||||||
{
|
{
|
||||||
|
case MENU_ENUM_LABEL_VIDEO_SHADERS_ENABLE:
|
||||||
|
{
|
||||||
|
if (*setting->value.target.boolean)
|
||||||
|
{
|
||||||
|
bool refresh = false;
|
||||||
|
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
|
||||||
|
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
|
||||||
|
}
|
||||||
|
else if (!*setting->value.target.boolean)
|
||||||
|
{
|
||||||
|
bool refresh = false;
|
||||||
|
settings_t *settings = config_get_ptr();
|
||||||
|
struct video_shader *shader = menu_shader_get();
|
||||||
|
|
||||||
|
shader->passes = 0;
|
||||||
|
|
||||||
|
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
|
||||||
|
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
|
||||||
|
command_event(CMD_EVENT_SHADERS_APPLY_CHANGES, NULL);
|
||||||
|
settings->bools.video_shader_enable = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
case MENU_ENUM_LABEL_VIDEO_THREADED:
|
case MENU_ENUM_LABEL_VIDEO_THREADED:
|
||||||
{
|
{
|
||||||
if (*setting->value.target.boolean)
|
if (*setting->value.target.boolean)
|
||||||
|
@ -7276,6 +7299,21 @@ static bool setting_append_list(
|
||||||
bool_entries[i].flags);
|
bool_entries[i].flags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
CONFIG_BOOL(
|
||||||
|
list, list_info,
|
||||||
|
&settings->bools.video_shader_enable,
|
||||||
|
MENU_ENUM_LABEL_VIDEO_SHADERS_ENABLE,
|
||||||
|
MENU_ENUM_LABEL_VALUE_VIDEO_SHADERS_ENABLE,
|
||||||
|
shader_enable,
|
||||||
|
MENU_ENUM_LABEL_VALUE_OFF,
|
||||||
|
MENU_ENUM_LABEL_VALUE_ON,
|
||||||
|
&group_info,
|
||||||
|
&subgroup_info,
|
||||||
|
parent_group,
|
||||||
|
general_write_handler,
|
||||||
|
general_read_handler,
|
||||||
|
SD_FLAG_NONE);
|
||||||
|
|
||||||
END_SUB_GROUP(list, list_info, parent_group);
|
END_SUB_GROUP(list, list_info, parent_group);
|
||||||
END_GROUP(list, list_info, parent_group);
|
END_GROUP(list, list_info, parent_group);
|
||||||
}
|
}
|
||||||
|
|
|
@ -561,6 +561,8 @@ enum msg_hash_enums
|
||||||
MENU_LABEL(SHADER_PIPELINE_BOKEH),
|
MENU_LABEL(SHADER_PIPELINE_BOKEH),
|
||||||
MENU_LABEL(SHADER_PIPELINE_SNOWFLAKE),
|
MENU_LABEL(SHADER_PIPELINE_SNOWFLAKE),
|
||||||
|
|
||||||
|
MENU_LABEL(VIDEO_SHADERS_ENABLE),
|
||||||
|
|
||||||
MENU_LABEL(MATERIALUI_MENU_HEADER_OPACITY),
|
MENU_LABEL(MATERIALUI_MENU_HEADER_OPACITY),
|
||||||
MENU_LABEL(MATERIALUI_MENU_FOOTER_OPACITY),
|
MENU_LABEL(MATERIALUI_MENU_FOOTER_OPACITY),
|
||||||
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE,
|
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE,
|
||||||
|
|
Loading…
Reference in New Issue