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

fix some potential crashes when a shader is not set in config

Browse Source
This commit is contained in:
radius 2018-01-30 22:38:03 -05:00
parent 37454f79a8
commit e9b7c7267e
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gfx/drivers/gl.c
View File

@ -380,9 +380,16 @@ static bool gl_shader_init(gl_t *gl, const gfx_ctx_driver_t *ctx_driver,
video_shader_ctx_init_t init_data; video_shader_ctx_init_t init_data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const char *shader_path = retroarch_get_shader_preset(); const char *shader_path = retroarch_get_shader_preset();
enum rarch_shader_type type = video_shader_parse_type(shader_path, enum rarch_shader_type type;
if (shader_path)
{
type = video_shader_parse_type(shader_path,
gl->core_context_in_use gl->core_context_in_use
? RARCH_SHADER_GLSL : DEFAULT_SHADER_TYPE); ? RARCH_SHADER_GLSL : DEFAULT_SHADER_TYPE);
}
else
type = DEFAULT_SHADER_TYPE;
switch (type) switch (type)
{ {

2
menu/menu_shader.c
View File

@ -138,7 +138,7 @@ bool menu_shader_manager_init(void)
menu_driver_shader = (struct video_shader*) menu_driver_shader = (struct video_shader*)
calloc(1, sizeof(struct video_shader)); calloc(1, sizeof(struct video_shader));
if (!menu_driver_shader) if (!menu_driver_shader || !path_shader)
return false; return false;
/* In a multi-config setting, we can't have /* In a multi-config setting, we can't have

4
retroarch.c
View File

@ -1945,14 +1945,14 @@ char* retroarch_get_shader_preset(void)
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!settings->bools.video_shader_enable) if (!settings->bools.video_shader_enable)
return ""; return NULL;
if (!string_is_empty(runtime_shader_preset)) if (!string_is_empty(runtime_shader_preset))
return runtime_shader_preset; return runtime_shader_preset;
else if (!string_is_empty(settings->paths.path_shader)) else if (!string_is_empty(settings->paths.path_shader))
return settings->paths.path_shader; return settings->paths.path_shader;
else else
return ""; return NULL;
} }
bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data) bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data)