diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-01-06 16:02:23 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2016-01-06 16:02:23 -0500 |
| commit | 7fcb5a803b2e6179fe57654496fcea7f6b2ff183 (patch) | |
| tree | 208e9b1ff3ec74f58d8d9cbb382a1d69c61d135d /Source/Core/VideoBackends | |
| parent | 05fdf0398b260f5e09b7a881336a2dcbcef074df (diff) | |
| parent | ad1f7576ade16e5ab6d3d914812bff38d956606e (diff) | |
Merge pull request #3359 from degasus/ini
VideoConfig: Use "GFX.ini" for both D3D and OGL.
Diffstat (limited to 'Source/Core/VideoBackends')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/main.cpp | 6 | ||||
| -rw-r--r-- | Source/Core/VideoBackends/OGL/main.cpp | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/D3D/main.cpp b/Source/Core/VideoBackends/D3D/main.cpp index 1fc919c332..d74cbbbfdf 100644 --- a/Source/Core/VideoBackends/D3D/main.cpp +++ b/Source/Core/VideoBackends/D3D/main.cpp @@ -153,7 +153,11 @@ bool VideoBackend::Initialize(void *window_handle) frameCount = 0; - g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini"); + if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini")) + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); + else + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini"); + g_Config.GameIniLoad(); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/main.cpp index e38663402f..1134b26302 100644 --- a/Source/Core/VideoBackends/OGL/main.cpp +++ b/Source/Core/VideoBackends/OGL/main.cpp @@ -145,7 +145,10 @@ bool VideoBackend::Initialize(void* window_handle) frameCount = 0; - g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini"); + if (File::Exists(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini")) + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "GFX.ini"); + else + g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini"); g_Config.GameIniLoad(); g_Config.UpdateProjectionHack(); g_Config.VerifyValidity(); |