Migrate RenderType string functions to static Renderer functions

Also fix some IWYU build errors
This commit is contained in:
Wunkolo 2023-07-18 10:02:07 -07:00
parent 528ed510c2
commit 0b60cf6901
4 changed files with 13 additions and 13 deletions

View file

@ -37,13 +37,13 @@ void EmulatorConfig::load(const std::filesystem::path& path) {
auto rendererResult = toml::expect<std::string>(gpu, "Renderer");
if (rendererResult.is_ok()) {
auto rendererName = rendererResult.unwrap();
if (auto configRendererType = fromString(rendererName); configRendererType.has_value()) {
if (auto configRendererType = Renderer::typeFromString(rendererName); configRendererType.has_value()) {
rendererType = configRendererType.value();
} else {
Helpers::warn("Invalid renderer specified: %s\n", rendererName.c_str());
}
} else {
Helpers::warn("Renderer not specified: %s\n", rendererResult.unwrap_err());
Helpers::warn("Renderer not specified: %s\n", rendererResult.unwrap_err().c_str());
}
shaderJitEnabled = toml::find_or<toml::boolean>(gpu, "EnableShaderJIT", false);
@ -69,7 +69,7 @@ void EmulatorConfig::save(const std::filesystem::path& path) {
printf("Saving new configuration file %s\n", path.string().c_str());
}
data["GPU"]["Renderer"] = toString(rendererType);
data["GPU"]["Renderer"] = Renderer::typeToString(rendererType);
data["GPU"]["EnableShaderJIT"] = shaderJitEnabled;
std::ofstream file(path, std::ios::out);