diff options
| author | shuffle2 <godisgovernment@gmail.com> | 2015-10-03 18:10:23 -0700 |
|---|---|---|
| committer | shuffle2 <godisgovernment@gmail.com> | 2015-10-03 18:10:23 -0700 |
| commit | 81414b4fa2edadf0b2a2bb0bd4df61dd59165eec (patch) | |
| tree | 4711189a836176019e1cd3913a6bac08b2bd751a /Source/Core/VideoBackends | |
| parent | b926061f641692ae31bacbeba304f5941db7d3bc (diff) | |
| parent | 7c1565b201ed3e1a2579da3e55efa995cbfb3f5d (diff) | |
Merge pull request #3076 from void-ghost/stereo3d_presets
Stereo3d presets
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/VideoBackend.h | 1 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/VideoBackend.h | 1 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWmain.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/Software/VideoBackend.h | 1 |
6 files changed, 24 insertions, 6 deletions
diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h index 7ab12f7d9d..117b2ef8ef 100644 --- a/Source/Core/VideoBackends/D3D/VideoBackend.h +++ b/Source/Core/VideoBackends/D3D/VideoBackend.h @@ -17,6 +17,7 @@ class VideoBackend : public VideoBackendHardware std::string GetName() const override; std::string GetDisplayName() const override; + std::string GetConfigName() const override; void Video_Prepare() override; void Video_Cleanup() override; diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 98ed5e60ea..bc6043a0b3 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -64,6 +64,11 @@ std::string VideoBackend::GetDisplayName() const return "Direct3D"; } +std::string VideoBackend::GetConfigName() const +{ + return "gfx_dx11"; +} + void InitBackendInfo() { HRESULT hr = DX11::D3D::LoadDXGI(); @@ -142,7 +147,7 @@ void InitBackendInfo() void VideoBackend::ShowConfig(void *hParent) { InitBackendInfo(); - Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_dx11"); + Host_ShowVideoConfig(hParent, GetDisplayName(), GetConfigName()); } bool VideoBackend::Initialize(void *window_handle) @@ -155,7 +160,7 @@ bool VideoBackend::Initialize(void *window_handle) frameCount = 0; - g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini"); + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini"); g_Config.GameIniLoad(); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h index e42813c3cb..9226f3dbe9 100644 --- a/Source/Core/VideoBackends/OGL/VideoBackend.h +++ b/Source/Core/VideoBackends/OGL/VideoBackend.h @@ -17,6 +17,7 @@ class VideoBackend : public VideoBackendHardware std::string GetName() const override; std::string GetDisplayName() const override; + std::string GetConfigName() const override; void Video_Prepare() override; void Video_Cleanup() override; diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index 95504448ba..365004503b 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -102,6 +102,11 @@ std::string VideoBackend::GetDisplayName() const return "OpenGL"; } +std::string VideoBackend::GetConfigName() const +{ + return "gfx_opengl"; +} + static std::vector<std::string> GetShaders(const std::string &sub_dir = "") { std::vector<std::string> paths = DoFileSearch({".glsl"}, { @@ -143,7 +148,7 @@ void VideoBackend::ShowConfig(void *_hParent) { if (!s_BackendInitialized) InitBackendInfo(); - Host_ShowVideoConfig(_hParent, GetDisplayName(), "gfx_opengl"); + Host_ShowVideoConfig(_hParent, GetDisplayName(), GetConfigName()); } bool VideoBackend::Initialize(void *window_handle) @@ -153,7 +158,7 @@ bool VideoBackend::Initialize(void *window_handle) frameCount = 0; - g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini"); + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini"); g_Config.GameIniLoad(); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index 83b55d0370..ba74f320c8 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -67,14 +67,19 @@ std::string VideoSoftware::GetDisplayName() const return "Software Renderer"; } +std::string VideoSoftware::GetConfigName() const +{ + return "gfx_software"; +} + void VideoSoftware::ShowConfig(void *hParent) { - Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software"); + Host_ShowVideoConfig(hParent, GetDisplayName(), GetConfigName()); } bool VideoSoftware::Initialize(void *window_handle) { - g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str()); + g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini").c_str()); InitInterface(); GLInterface->SetMode(GLInterfaceMode::MODE_DETECT); diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h index e34ae07f9a..6b4c79a5c7 100644 --- a/Source/Core/VideoBackends/Software/VideoBackend.h +++ b/Source/Core/VideoBackends/Software/VideoBackend.h @@ -19,6 +19,7 @@ class VideoSoftware : public VideoBackend std::string GetName() const override; std::string GetDisplayName() const override; + std::string GetConfigName() const override; void EmuStateChange(EMUSTATE_CHANGE newState) override; |
