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

Fix CXX_BUILD

Browse Source
This commit is contained in:
twinaphex 2019-06-19 00:04:08 +02:00
parent 47d5da560b
commit eee7430ffa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu_shader.c
View File

@ -457,14 +457,14 @@ enum rarch_shader_type menu_shader_manager_get_type(const void *data)
case RARCH_SHADER_GLSL: case RARCH_SHADER_GLSL:
case RARCH_SHADER_SLANG: case RARCH_SHADER_SLANG:
if (type != pass_type) if (type != pass_type)
return RARCH_SHADER_NONE; return (enum rarch_shader_type)RARCH_SHADER_NONE;
break; break;
default: default:
break; break;
} }
} }
return type; return (enum rarch_shader_type)type;
} }
/** /**

6
retroarch.c
View File

@ -13809,10 +13809,10 @@ static bool retroarch_load_shader_preset_internal(
*/ */
static bool retroarch_load_shader_preset(void) static bool retroarch_load_shader_preset(void)
{ {
const settings_t *settings = config_get_ptr(); const settings_t *settings = configuration_settings;
const rarch_system_info_t *system = runloop_get_system_info(); const rarch_system_info_t *system = &runloop_system;
const char *video_shader_directory = settings->paths.directory_video_shader; const char *video_shader_directory = settings->paths.directory_video_shader;
const char *core_name = system ? system->info.library_name : NULL; const char *core_name = system->info.library_name;
const char *rarch_path_basename = path_get(RARCH_PATH_BASENAME); const char *rarch_path_basename = path_get(RARCH_PATH_BASENAME);
const char *game_name = path_basename(rarch_path_basename); const char *game_name = path_basename(rarch_path_basename);