mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
libretroadmin 2023-02-28 18:32:11 +01:00
parent e8d88f1b78
commit 0422dfb5b5
3 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/video_shader_parse.c
View File

@ -296,7 +296,10 @@ static void replace_wildcards(char *inout_absolute_path, const unsigned in_absol
"VID-USER-ROT-180", "VID-USER-ROT-180",
"VID-USER-ROT-270" "VID-USER-ROT-270"
}; };
strlcpy(replace_text, rotation_replace_strings[retroarch_get_video_rotation()], sizeof(replace_text)); settings_t *settings = config_get_ptr();
strlcpy(replace_text,
rotation_replace_strings[settings->uints.video_rotation],
sizeof(replace_text));
break; break;
} }
case RARCH_WILDCARD_VIDEO_FINAL_ROTATION: case RARCH_WILDCARD_VIDEO_FINAL_ROTATION:
@ -417,7 +420,7 @@ static void replace_wildcards(char *inout_absolute_path, const unsigned in_absol
} }
/** /**
* gather_reference_path_list: * video_shader_gather_reference_path_list:
* *
* @param path_linked_list * @param path_linked_list
* List of paths which accrues as we move down the chain of references * List of paths which accrues as we move down the chain of references
@ -428,7 +431,7 @@ static void replace_wildcards(char *inout_absolute_path, const unsigned in_absol
* *
* @return void * @return void
**/ **/
static void gather_reference_path_list( static void video_shader_gather_reference_path_list(
struct path_linked_list *in_path_linked_list, struct path_linked_list *in_path_linked_list,
char *path, char *path,
int reference_depth) int reference_depth)
@ -449,7 +452,7 @@ static void gather_reference_path_list(
fill_pathname_expanded_and_absolute(reference_preset_path, conf->path, ref_tmp->path); fill_pathname_expanded_and_absolute(reference_preset_path, conf->path, ref_tmp->path);
replace_wildcards(reference_preset_path, PATH_MAX_LENGTH, conf->path); replace_wildcards(reference_preset_path, PATH_MAX_LENGTH, conf->path);
gather_reference_path_list(in_path_linked_list, reference_preset_path, reference_depth + 1); video_shader_gather_reference_path_list(in_path_linked_list, reference_preset_path, reference_depth + 1);
free(reference_preset_path); free(reference_preset_path);
ref_tmp = ref_tmp->next; ref_tmp = ref_tmp->next;
@ -2372,7 +2375,7 @@ bool video_shader_load_preset_into_shader(const char *path,
/* Gather all the paths of all of the presets in all reference chains */ /* Gather all the paths of all of the presets in all reference chains */
override_paths_list = path_linked_list_new(); override_paths_list = path_linked_list_new();
gather_reference_path_list(override_paths_list, conf->path, 0); video_shader_gather_reference_path_list(override_paths_list, conf->path, 0);
/* /*
* Step through the references and apply overrides for each one * Step through the references and apply overrides for each one

5
retroarch.h
View File

@ -143,11 +143,6 @@ const char* config_get_audio_driver_options(void);
/* Camera */ /* Camera */
/*
Returns the user defined video rotation set in the video_rotation user setting
*/
unsigned int retroarch_get_video_rotation(void);
/* /*
Returns rotation requested by the core regardless of if it has been Returns rotation requested by the core regardless of if it has been
applied with the final video rotation applied with the final video rotation

13
runloop.c
View File

@ -4255,16 +4255,6 @@ unsigned runloop_get_video_swap_interval(
swap_interval_config; swap_interval_config;
} }
/*
Returns the user defined video rotation set in the video_rotation user setting
*/
unsigned int retroarch_get_video_rotation(void)
{
settings_t *settings = config_get_ptr();
unsigned video_rotation = settings->uints.video_rotation;
return settings->uints.video_rotation;
}
/* /*
Returns rotation requested by the core regardless of if it has been Returns rotation requested by the core regardless of if it has been
applied with the final video rotation applied with the final video rotation
@ -4280,7 +4270,8 @@ unsigned int retroarch_get_core_requested_rotation(void)
*/ */
unsigned int retroarch_get_rotation(void) unsigned int retroarch_get_rotation(void)
{ {
return retroarch_get_video_rotation() + runloop_state.system.rotation; settings_t *settings = config_get_ptr();
return settings->uints.video_rotation + runloop_state.system.rotation;
} }
static void retro_run_null(void) { } /* Stub function callback impl. */ static void retro_run_null(void) { } /* Stub function callback impl. */