CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-03-06 10:27:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get rid of HAVE_SHADER_MANAGER

Browse Source
This commit is contained in:
twinaphex 2018-02-25 23:03:39 +01:00
parent 7bc9e5260e
commit e75992a66f
6 changed files with 63 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gfx/video_driver.h
View File

@ -43,11 +43,6 @@
#define RARCH_SCALE_BASE 256 #define RARCH_SCALE_BASE 256
#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_SLANG)
#ifndef HAVE_SHADER_MANAGER
#define HAVE_SHADER_MANAGER
#endif
#include "video_shader_parse.h" #include "video_shader_parse.h"
#define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1) #define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
@ -58,8 +53,6 @@
#define VIDEO_SHADER_MENU_5 (GFX_MAX_SHADERS - 6) #define VIDEO_SHADER_MENU_5 (GFX_MAX_SHADERS - 6)
#define VIDEO_SHADER_MENU_6 (GFX_MAX_SHADERS - 7) #define VIDEO_SHADER_MENU_6 (GFX_MAX_SHADERS - 7)
#endif
#if defined(_XBOX360) #if defined(_XBOX360)
#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL #define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL
#elif defined(__PSL1GHT__) || defined(HAVE_OPENGLES2) || defined(HAVE_GLSL) #elif defined(__PSL1GHT__) || defined(HAVE_OPENGLES2) || defined(HAVE_GLSL)

14
gfx/video_shader_parse.c
View File

@ -1083,6 +1083,20 @@ bool video_shader_is_supported(enum rarch_shader_type type)
return false; return false;
} }
bool video_shader_any_supported(void)
{
if (
video_shader_is_supported(RARCH_SHADER_SLANG) ||
video_shader_is_supported(RARCH_SHADER_HLSL) ||
video_shader_is_supported(RARCH_SHADER_GLSL) ||
video_shader_is_supported(RARCH_SHADER_CG)
)
return true;
return false;
}
enum rarch_shader_type video_shader_get_type_from_ext( enum rarch_shader_type video_shader_get_type_from_ext(
const char *ext, bool *is_preset) const char *ext, bool *is_preset)
{ {

2
gfx/video_shader_parse.h
View File

@ -244,6 +244,8 @@ enum rarch_shader_type video_shader_get_type_from_ext(
bool video_shader_is_supported(enum rarch_shader_type type); bool video_shader_is_supported(enum rarch_shader_type type);
bool video_shader_any_supported(void);
bool video_shader_check_for_changes(void); bool video_shader_check_for_changes(void);
RETRO_END_DECLS RETRO_END_DECLS

26
menu/menu_displaylist.c
View File

@ -2689,16 +2689,17 @@ static int menu_displaylist_parse_load_content_settings(
MENU_ENUM_LABEL_DISK_OPTIONS, MENU_ENUM_LABEL_DISK_OPTIONS,
MENU_SETTING_ACTION_CORE_DISK_OPTIONS, 0, 0); MENU_SETTING_ACTION_CORE_DISK_OPTIONS, 0, 0);
#ifdef HAVE_SHADER_MANAGER if (video_shader_any_supported())
if (settings->bools.quick_menu_show_shaders && !settings->bools.kiosk_mode_enable)
{ {
menu_entries_append_enum(info->list, if (settings->bools.quick_menu_show_shaders && !settings->bools.kiosk_mode_enable)
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS), {
msg_hash_to_str(MENU_ENUM_LABEL_SHADER_OPTIONS), menu_entries_append_enum(info->list,
MENU_ENUM_LABEL_SHADER_OPTIONS, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS),
MENU_SETTING_ACTION, 0, 0); msg_hash_to_str(MENU_ENUM_LABEL_SHADER_OPTIONS),
MENU_ENUM_LABEL_SHADER_OPTIONS,
MENU_SETTING_ACTION, 0, 0);
}
} }
#endif
if (settings->bools.quick_menu_show_save_core_overrides && !settings->bools.kiosk_mode_enable) if (settings->bools.quick_menu_show_save_core_overrides && !settings->bools.kiosk_mode_enable)
{ {
@ -5213,11 +5214,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_QUICK_MENU_SHOW_CHEATS, MENU_ENUM_LABEL_QUICK_MENU_SHOW_CHEATS,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);
#ifdef HAVE_SHADER_MANAGER if (video_shader_any_supported())
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_QUICK_MENU_SHOW_SHADERS, MENU_ENUM_LABEL_QUICK_MENU_SHOW_SHADERS,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);
#endif
menu_displaylist_parse_settings_enum(menu, info, menu_displaylist_parse_settings_enum(menu, info,
MENU_ENUM_LABEL_QUICK_MENU_SHOW_SAVE_CORE_OVERRIDES, MENU_ENUM_LABEL_QUICK_MENU_SHOW_SAVE_CORE_OVERRIDES,
PARSE_ONLY_BOOL, false); PARSE_ONLY_BOOL, false);

62
menu/menu_setting.c
View File

@ -5635,20 +5635,21 @@ static bool setting_append_list(
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
#ifdef HAVE_SHADERPIPELINE if (video_shader_any_supported())
CONFIG_UINT( {
list, list_info, CONFIG_UINT(
&settings->uints.menu_xmb_shader_pipeline, list, list_info,
MENU_ENUM_LABEL_XMB_RIBBON_ENABLE, &settings->uints.menu_xmb_shader_pipeline,
MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE, MENU_ENUM_LABEL_XMB_RIBBON_ENABLE,
menu_shader_pipeline, MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
&group_info, menu_shader_pipeline,
&subgroup_info, &group_info,
parent_group, &subgroup_info,
general_write_handler, parent_group,
general_read_handler); general_write_handler,
menu_settings_list_current_add_range(list, list_info, 0, XMB_SHADER_PIPELINE_LAST-1, 1, true, true); general_read_handler);
#endif menu_settings_list_current_add_range(list, list_info, 0, XMB_SHADER_PIPELINE_LAST-1, 1, true, true);
}
CONFIG_UINT( CONFIG_UINT(
list, list_info, list, list_info,
@ -6345,22 +6346,23 @@ static bool setting_append_list(
general_read_handler, general_read_handler,
SD_FLAG_NONE); SD_FLAG_NONE);
#ifdef HAVE_SHADER_MANAGER if (video_shader_any_supported())
CONFIG_BOOL( {
list, list_info, CONFIG_BOOL(
&settings->bools.quick_menu_show_shaders, list, list_info,
MENU_ENUM_LABEL_QUICK_MENU_SHOW_SHADERS, &settings->bools.quick_menu_show_shaders,
MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SHADERS, MENU_ENUM_LABEL_QUICK_MENU_SHOW_SHADERS,
quick_menu_show_shaders, MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SHADERS,
MENU_ENUM_LABEL_VALUE_OFF, quick_menu_show_shaders,
MENU_ENUM_LABEL_VALUE_ON, MENU_ENUM_LABEL_VALUE_OFF,
&group_info, MENU_ENUM_LABEL_VALUE_ON,
&subgroup_info, &group_info,
parent_group, &subgroup_info,
general_write_handler, parent_group,
general_read_handler, general_write_handler,
SD_FLAG_NONE); general_read_handler,
#endif SD_FLAG_NONE);
}
CONFIG_BOOL( CONFIG_BOOL(
list, list_info, list, list_info,

6
menu/menu_shader.c
View File

@ -39,11 +39,9 @@ static struct video_shader *menu_driver_shader = NULL;
struct video_shader *menu_shader_get(void) struct video_shader *menu_shader_get(void)
{ {
#ifdef HAVE_SHADER_MANAGER if (video_shader_any_supported())
return menu_driver_shader; return menu_driver_shader;
#else
return NULL; return NULL;
#endif
} }
struct video_shader_parameter *menu_shader_manager_get_parameters(unsigned i) struct video_shader_parameter *menu_shader_manager_get_parameters(unsigned i)