diff options
| author | Markus Wick <markus+github@selfnet.de> | 2015-01-26 11:08:29 +0100 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2015-01-26 11:08:29 +0100 |
| commit | 53a9df10f9d7a53bce947a0fdc43e6d3c482bf86 (patch) | |
| tree | 6983b4fcc6a0622a6602c041b50d2b8223643e2f /Source/Core/VideoBackends/OGL/main.cpp | |
| parent | 5ba1319abbcfc8bd4449a1b5581c6020b28d9b7f (diff) | |
| parent | 5c4ee2f71e2e1c80ba2bf829751f1202f6e65ee9 (diff) | |
Merge pull request #1817 from Armada651/custom-anaglyph
PostProcessing: Add support for user-supplied anaglyph shaders.
Diffstat (limited to 'Source/Core/VideoBackends/OGL/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index f549fed5d6..68565e50fd 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -95,14 +95,14 @@ std::string VideoBackend::GetDisplayName() const return "OpenGL"; } -static void GetShaders(std::vector<std::string> &shaders) +static void GetShaders(std::vector<std::string> &shaders, const std::string &sub_dir = "") { std::set<std::string> already_found; shaders.clear(); - static const std::string directories[] = { - File::GetUserPath(D_SHADERS_IDX), - File::GetSysDirectory() + SHADERS_DIR DIR_SEP, + const std::string directories[] = { + File::GetUserPath(D_SHADERS_IDX) + sub_dir, + File::GetSysDirectory() + SHADERS_DIR DIR_SEP + sub_dir, }; for (auto& directory : directories) { @@ -139,6 +139,7 @@ static void InitBackendInfo() g_Config.backend_info.bSupportsOversizedViewports = true; g_Config.backend_info.bSupportsGeometryShaders = true; g_Config.backend_info.bSupports3DVision = false; + g_Config.backend_info.bSupportsPostProcessing = true; g_Config.backend_info.Adapters.clear(); @@ -148,6 +149,7 @@ static void InitBackendInfo() // pp shaders GetShaders(g_Config.backend_info.PPShaders); + GetShaders(g_Config.backend_info.AnaglyphShaders, std::string(ANAGLYPH_DIR DIR_SEP)); } void VideoBackend::ShowConfig(void *_hParent) |