diff --git a/Source/Core/VideoCommon/PostProcessing.cpp b/Source/Core/VideoCommon/PostProcessing.cpp index 027ad85ab5..756bcea5e0 100644 --- a/Source/Core/VideoCommon/PostProcessing.cpp +++ b/Source/Core/VideoCommon/PostProcessing.cpp @@ -63,6 +63,10 @@ std::vector PostProcessingShaderImplementation::GetAnaglyphShaderLi return {}; } +PostProcessingShaderConfiguration::PostProcessingShaderConfiguration() = default; + +PostProcessingShaderConfiguration::~PostProcessingShaderConfiguration() = default; + std::string PostProcessingShaderConfiguration::LoadShader(std::string shader) { // Load the shader from the configuration if there isn't one sent to us. diff --git a/Source/Core/VideoCommon/PostProcessing.h b/Source/Core/VideoCommon/PostProcessing.h index f453fff587..e610b7fc38 100644 --- a/Source/Core/VideoCommon/PostProcessing.h +++ b/Source/Core/VideoCommon/PostProcessing.h @@ -46,20 +46,21 @@ public: bool m_dirty; }; - typedef std::map ConfigMap; + using ConfigMap = std::map; + + PostProcessingShaderConfiguration(); + virtual ~PostProcessingShaderConfiguration(); - PostProcessingShaderConfiguration() : m_current_shader("") {} - virtual ~PostProcessingShaderConfiguration() {} // Loads the configuration with a shader // If the argument is "" the class will load the shader from the g_activeConfig option. // Returns the loaded shader source from file std::string LoadShader(std::string shader = ""); void SaveOptionsConfiguration(); void ReloadShader(); - std::string GetShader() { return m_current_shader; } - bool IsDirty() { return m_any_options_dirty; } + const std::string& GetShader() const { return m_current_shader; } + bool IsDirty() const { return m_any_options_dirty; } void SetDirty(bool dirty) { m_any_options_dirty = dirty; } - bool HasOptions() { return m_options.size() > 0; } + bool HasOptions() const { return m_options.size() > 0; } const ConfigMap& GetOptions() const { return m_options; } ConfigMap& GetOptions() { return m_options; } const ConfigurationOption& GetOption(const std::string& option) { return m_options[option]; } @@ -69,7 +70,7 @@ public: void SetOptionb(const std::string& option, bool value); private: - bool m_any_options_dirty; + bool m_any_options_dirty = false; std::string m_current_shader; ConfigMap m_options;