From c339c7d1c511a96e6a5e57e50d36f1318b5f0da2 Mon Sep 17 00:00:00 2001 From: wheremyfoodat <44909372+wheremyfoodat@users.noreply.github.com> Date: Tue, 18 Jul 2023 22:45:55 +0300 Subject: [PATCH] Bonk --- include/renderer.hpp | 3 +-- src/config.cpp | 3 ++- src/renderer.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/renderer.hpp b/include/renderer.hpp index 05f418db..e14afcea 100644 --- a/include/renderer.hpp +++ b/include/renderer.hpp @@ -1,7 +1,6 @@ #pragma once #include #include -#include #include #include "PICA/pica_vertex.hpp" @@ -38,7 +37,7 @@ class Renderer { static constexpr u32 vertexBufferSize = 0x10000; static std::optional typeFromString(std::string inString); - static std::string typeToString(RendererType rendererType); + static const char* typeToString(RendererType rendererType); virtual void reset() = 0; virtual void display() = 0; // Display the 3DS screen contents to the window diff --git a/src/config.cpp b/src/config.cpp index 9fdbe17f..a5e9330c 100644 --- a/src/config.cpp +++ b/src/config.cpp @@ -1,6 +1,7 @@ #include "config.hpp" #include +#include #include "helpers.hpp" #include "toml.hpp" @@ -68,7 +69,7 @@ void EmulatorConfig::save(const std::filesystem::path& path) { } data["GPU"]["EnableShaderJIT"] = shaderJitEnabled; - data["GPU"]["Renderer"] = Renderer::typeToString(rendererType); + data["GPU"]["Renderer"] = std::string(Renderer::typeToString(rendererType)); std::ofstream file(path, std::ios::out); file << data; diff --git a/src/renderer.cpp b/src/renderer.cpp index b6987538..3ba29aea 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -25,11 +25,11 @@ std::optional Renderer::typeFromString(std::string inString) { return std::nullopt; } -std::string Renderer::typeToString(RendererType rendererType) { +const char* Renderer::typeToString(RendererType rendererType) { switch (rendererType) { case RendererType::Null: return "null"; case RendererType::OpenGL: return "opengl"; - case RendererType::Vulkan: return "vk"; + case RendererType::Vulkan: return "vulkan"; default: return "Invalid"; } } \ No newline at end of file