mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

get_default_shader_dir - go automatically to shaders_slang,

Browse Source 
shaders_glsl or shader_cg if the current video driver and context
only supports one of the shader types instead of several
This commit is contained in:
twinaphex 2019-08-11 22:50:19 +02:00
parent 4d45174940
commit 35732f9a8c
1 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
menu/cbs/menu_cbs_ok.c
View File

@ -300,6 +300,48 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl)
return MSG_UNKNOWN; return MSG_UNKNOWN;
} }
static const char *get_default_shader_dir(void)
{
settings_t *settings = config_get_ptr();
const char *def_shader_dir = settings->paths.directory_video_shader;
bool slang_supported = video_shader_is_supported(RARCH_SHADER_SLANG);
bool glsl_supported = video_shader_is_supported(RARCH_SHADER_GLSL);
bool cg_supported = video_shader_is_supported(RARCH_SHADER_CG);
if (slang_supported)
{
static char new_path[1024];
new_path[0] = '\0';
fill_pathname_join(new_path,
def_shader_dir, "shaders_slang",
sizeof(new_path));
if (path_is_directory(new_path))
return new_path;
}
else if (glsl_supported && !cg_supported)
{
static char new_path[1024];
new_path[0] = '\0';
fill_pathname_join(new_path,
def_shader_dir, "shaders_glsl",
sizeof(new_path));
if (path_is_directory(new_path))
return new_path;
}
else if (cg_supported && !glsl_supported)
{
static char new_path[1024];
new_path[0] = '\0';
fill_pathname_join(new_path,
def_shader_dir, "shaders_cg",
sizeof(new_path));
if (path_is_directory(new_path))
return new_path;
}
return def_shader_dir;
}
int generic_action_ok_displaylist_push(const char *path, int generic_action_ok_displaylist_push(const char *path,
const char *new_path, const char *new_path,
const char *label, unsigned type, size_t idx, size_t entry_idx, const char *label, unsigned type, size_t idx, size_t entry_idx,
@ -483,16 +525,6 @@ int generic_action_ok_displaylist_push(const char *path,
info.enum_idx = MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN; info.enum_idx = MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN;
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE; dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
break; break;
case ACTION_OK_DL_SHADER_PASS:
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
filebrowser_clear_type();
info.type = type;
info.directory_ptr = idx;
info_path = settings->paths.directory_video_shader;
info_label = label;
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
#endif
break;
case ACTION_OK_DL_SHADER_PARAMETERS: case ACTION_OK_DL_SHADER_PARAMETERS:
info.type = MENU_SETTING_ACTION; info.type = MENU_SETTING_ACTION;
info.directory_ptr = idx; info.directory_ptr = idx;
@ -536,12 +568,22 @@ int generic_action_ok_displaylist_push(const char *path,
info_label = label; info_label = label;
dl_type = DISPLAYLIST_GENERIC; dl_type = DISPLAYLIST_GENERIC;
break; break;
case ACTION_OK_DL_SHADER_PASS:
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
filebrowser_clear_type();
info.type = type;
info.directory_ptr = idx;
info_path = get_default_shader_dir();
info_label = label;
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
#endif
break;
case ACTION_OK_DL_SHADER_PRESET: case ACTION_OK_DL_SHADER_PRESET:
#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL) #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
filebrowser_clear_type(); filebrowser_clear_type();
info.type = type; info.type = type;
info.directory_ptr = idx; info.directory_ptr = idx;
info_path = settings->paths.directory_video_shader; info_path = get_default_shader_dir();
info_label = label; info_label = label;
dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE; dl_type = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
#endif #endif