diff options
| author | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-08-25 09:17:30 +0200 |
|---|---|---|
| committer | Dolphin Bot <dolphin-emu-bot@users.noreply.github.com> | 2014-08-25 09:17:30 +0200 |
| commit | 2f2f992bc7167217a283fb17a8718fcd349150a0 (patch) | |
| tree | 8480c18a2d026d037561091f8e958f2ee9cf931c /Source/Core/VideoCommon/PostProcessing.h | |
| parent | c87a0021f4fb44c13125e1f676fd1946e7c18250 (diff) | |
| parent | 2d624780c05ecfee62bcf3c04d35e767063fac5a (diff) | |
Merge pull request #828 from Sonicadvance1/pp-shader-catch-broken-config
Catch broken configurations inside of the Post Processing shaders.
Diffstat (limited to 'Source/Core/VideoCommon/PostProcessing.h')
| -rw-r--r-- | Source/Core/VideoCommon/PostProcessing.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/Core/VideoCommon/PostProcessing.h b/Source/Core/VideoCommon/PostProcessing.h index 0f539dbb05..45ba0fcea2 100644 --- a/Source/Core/VideoCommon/PostProcessing.h +++ b/Source/Core/VideoCommon/PostProcessing.h @@ -21,6 +21,7 @@ public: OPTION_BOOL = 0, OPTION_FLOAT, OPTION_INTEGER, + OPTION_INVALID, }; bool m_bool_value; @@ -75,6 +76,9 @@ private: std::string m_current_shader; ConfigMap m_options; + // Verifies if a configurationOption is valid or not + // Returns an error string on error + std::string VerifyOptions(const ConfigMap& config_map); void LoadOptions(const std::string& code); void LoadOptionsConfiguration(); }; |
