ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6930 from lioncash/post 

VideoCommon/PostProcessing: Minor changes
This commit is contained in:
Léo Lam 2018-05-21 21:12:27 +02:00 committed by GitHub
parent db5c2ffb41 c4d27cc8ec
commit 32c4f3d158
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/PostProcessing.cpp
View File

@ -63,6 +63,10 @@ std::vector<std::string> PostProcessingShaderImplementation::GetAnaglyphShaderLi
return {}; return {};
} }
PostProcessingShaderConfiguration::PostProcessingShaderConfiguration() = default;
PostProcessingShaderConfiguration::~PostProcessingShaderConfiguration() = default;
std::string PostProcessingShaderConfiguration::LoadShader(std::string shader) std::string PostProcessingShaderConfiguration::LoadShader(std::string shader)
{ {
// Load the shader from the configuration if there isn't one sent to us. // Load the shader from the configuration if there isn't one sent to us.

15
Source/Core/VideoCommon/PostProcessing.h
View File

@ -46,20 +46,21 @@ public:
bool m_dirty; bool m_dirty;
}; };
typedef std::map<std::string, ConfigurationOption> ConfigMap; using ConfigMap = std::map<std::string, ConfigurationOption>;
PostProcessingShaderConfiguration();
virtual ~PostProcessingShaderConfiguration();
PostProcessingShaderConfiguration() : m_current_shader("") {}
virtual ~PostProcessingShaderConfiguration() {}
// Loads the configuration with a shader // Loads the configuration with a shader
// If the argument is "" the class will load the shader from the g_activeConfig option. // If the argument is "" the class will load the shader from the g_activeConfig option.
// Returns the loaded shader source from file // Returns the loaded shader source from file
std::string LoadShader(std::string shader = ""); std::string LoadShader(std::string shader = "");
void SaveOptionsConfiguration(); void SaveOptionsConfiguration();
void ReloadShader(); void ReloadShader();
std::string GetShader() { return m_current_shader; } const std::string& GetShader() const { return m_current_shader; }
bool IsDirty() { return m_any_options_dirty; } bool IsDirty() const { return m_any_options_dirty; }
void SetDirty(bool dirty) { m_any_options_dirty = 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; } const ConfigMap& GetOptions() const { return m_options; }
ConfigMap& GetOptions() { return m_options; } ConfigMap& GetOptions() { return m_options; }
const ConfigurationOption& GetOption(const std::string& option) { return m_options[option]; } const ConfigurationOption& GetOption(const std::string& option) { return m_options[option]; }
@ -69,7 +70,7 @@ public:
void SetOptionb(const std::string& option, bool value); void SetOptionb(const std::string& option, bool value);
private: private:
bool m_any_options_dirty; bool m_any_options_dirty = false;
std::string m_current_shader; std::string m_current_shader;
ConfigMap m_options; ConfigMap m_options;