video_shader_replace_wildcards - get rid of the 2D char arrays

This commit is contained in:
LibretroAdmin 2025-01-15 15:25:27 +01:00
parent 7456711eaa
commit 076c2bca3b
1 changed files with 24 additions and 45 deletions

View File

@ -290,17 +290,12 @@ static void video_shader_replace_wildcards(char *s, size_t len, char *in_preset_
strlcpy(replace_text, config_get_ptr()->arrays.video_driver, sizeof(replace_text)); strlcpy(replace_text, config_get_ptr()->arrays.video_driver, sizeof(replace_text));
break; break;
case RARCH_WILDCARD_CORE_REQUESTED_ROTATION: case RARCH_WILDCARD_CORE_REQUESTED_ROTATION:
{ _len = strlcpy(replace_text, "CORE-REQ-ROT-", sizeof(replace_text));
char rotation_replace_strings[4][24] = { _len += snprintf(
"CORE-REQ-ROT-0", replace_text + _len,
"CORE-REQ-ROT-90", sizeof(replace_text) - _len,
"CORE-REQ-ROT-180", "%d",
"CORE-REQ-ROT-270" retroarch_get_core_requested_rotation() * 90);
};
_len = strlcpy(replace_text,
rotation_replace_strings[retroarch_get_core_requested_rotation()],
sizeof(replace_text));
}
break; break;
case RARCH_WILDCARD_VIDEO_ALLOW_CORE_ROTATION: case RARCH_WILDCARD_VIDEO_ALLOW_CORE_ROTATION:
_len = strlcpy(replace_text, "VID-ALLOW-CORE-ROT-O", _len = strlcpy(replace_text, "VID-ALLOW-CORE-ROT-O",
@ -311,44 +306,28 @@ static void video_shader_replace_wildcards(char *s, size_t len, char *in_preset_
_len += strlcpy(replace_text + _len, "FF", sizeof(replace_text) - _len); _len += strlcpy(replace_text + _len, "FF", sizeof(replace_text) - _len);
break; break;
case RARCH_WILDCARD_VIDEO_USER_ROTATION: case RARCH_WILDCARD_VIDEO_USER_ROTATION:
{ _len = strlcpy(replace_text, "VID-USER-ROT-", sizeof(replace_text));
char rotation_replace_strings[4][24] = { _len += snprintf(
"VID-USER-ROT-0", replace_text + _len,
"VID-USER-ROT-90", sizeof(replace_text) - _len,
"VID-USER-ROT-180", "%d",
"VID-USER-ROT-270" config_get_ptr()->uints.video_rotation * 90);
};
settings_t *settings = config_get_ptr();
_len = 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:
{ _len = strlcpy(replace_text, "VID-FINAL-ROT-", sizeof(replace_text));
char rotation_replace_strings[4][24] = { _len += snprintf(
"VID-FINAL-ROT-0", replace_text + _len,
"VID-FINAL-ROT-90", sizeof(replace_text) - _len,
"VID-FINAL-ROT-180", "%d",
"VID-FINAL-ROT-270" retroarch_get_rotation() * 90);
};
_len = strlcpy(replace_text,
rotation_replace_strings[retroarch_get_rotation()],
sizeof(replace_text));
}
break; break;
case RARCH_WILDCARD_SCREEN_ORIENTATION: case RARCH_WILDCARD_SCREEN_ORIENTATION:
{ _len = strlcpy(replace_text, "SCREEN-ORIENT-", sizeof(replace_text));
char rotation_replace_strings[4][24] = { _len += snprintf(
"SCREEN-ORIENT-0", replace_text + _len,
"SCREEN-ORIENT-90", sizeof(replace_text) - _len,
"SCREEN-ORIENT-180", "%d",
"SCREEN-ORIENT-270" config_get_ptr()->uints.screen_orientation * 90);
};
_len = strlcpy(replace_text,
rotation_replace_strings[config_get_ptr()->uints.screen_orientation],
sizeof(replace_text));
}
break; break;
case RARCH_WILDCARD_CORE_ASPECT_ORIENTATION: case RARCH_WILDCARD_CORE_ASPECT_ORIENTATION:
{ {