ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Style nits

This commit is contained in:
twinaphex 2016-02-14 17:44:00 +01:00
parent 3f265360db
commit bb0b6a6b68
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
menu/menu_shader.c
View File

@ -70,8 +70,10 @@ void menu_shader_manager_init(menu_handle_t *menu)
} }
else else
{ {
strlcpy(menu->default_glslp, "menu.glslp", sizeof(menu->default_glslp)); strlcpy(menu->default_glslp, "menu.glslp",
strlcpy(menu->default_cgp, "menu.cgp", sizeof(menu->default_cgp)); sizeof(menu->default_glslp));
strlcpy(menu->default_cgp, "menu.cgp",
sizeof(menu->default_cgp));
} }
ext = path_get_extension(settings->video.shader_path); ext = path_get_extension(settings->video.shader_path);
@ -86,7 +88,8 @@ void menu_shader_manager_init(menu_handle_t *menu)
{ {
if (video_shader_read_conf_cgp(conf, shader)) if (video_shader_read_conf_cgp(conf, shader))
{ {
video_shader_resolve_relative(shader, settings->video.shader_path); video_shader_resolve_relative(shader,
settings->video.shader_path);
video_shader_resolve_parameters(conf, shader); video_shader_resolve_parameters(conf, shader);
} }
config_file_free(conf); config_file_free(conf);
@ -153,13 +156,12 @@ void menu_shader_manager_set_preset(struct video_shader *shader,
/* Makes sure that we use Menu Preset shader on driver reinit. /* Makes sure that we use Menu Preset shader on driver reinit.
* Only do this when the cgp actually works to avoid potential errors. */ * Only do this when the cgp actually works to avoid potential errors. */
strlcpy(settings->video.shader_path, preset_path ? preset_path : "", strlcpy(settings->video.shader_path,
preset_path ? preset_path : "",
sizeof(settings->video.shader_path)); sizeof(settings->video.shader_path));
settings->video.shader_enable = true; settings->video.shader_enable = true;
if (!preset_path) if (!preset_path || !shader)
return;
if (!shader)
return; return;
/* Load stored Preset into menu on success. /* Load stored Preset into menu on success.
@ -232,7 +234,8 @@ void menu_shader_manager_save_preset(
strlcpy(buffer, basename, sizeof(buffer)); strlcpy(buffer, basename, sizeof(buffer));
/* Append extension automatically as appropriate. */ /* Append extension automatically as appropriate. */
if (!strstr(basename, ".cgp") && !strstr(basename, ".glslp")) if ( !strstr(basename, ".cgp")
&& !strstr(basename, ".glslp"))
{ {
switch (type) switch (type)
{ {
@ -269,7 +272,9 @@ void menu_shader_manager_save_preset(
if (!*dirs[d]) if (!*dirs[d])
continue; continue;
fill_pathname_join(preset_path, dirs[d], buffer, sizeof(preset_path)); fill_pathname_join(preset_path, dirs[d],
buffer, sizeof(preset_path));
if (config_file_write(conf, preset_path)) if (config_file_write(conf, preset_path))
{ {
RARCH_LOG("Saved shader preset to %s.\n", preset_path); RARCH_LOG("Saved shader preset to %s.\n", preset_path);