diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:14:59 -0700 |
|---|---|---|
| committer | Pierre Bourdon <delroth@gmail.com> | 2014-08-03 21:14:59 -0700 |
| commit | e15ec56bf0237dba3db5cf969d68566af3a79194 (patch) | |
| tree | 110dba64d967a44be6c1699f9331320cd21e877d /Source/Core/DolphinWX/Main.cpp | |
| parent | 89adfba67bdf145ad0eae174cbe755f9aa7aa802 (diff) | |
| parent | 1fcf07f9cccf838894bf7a869ec0749cf2abbb2d (diff) | |
Merge pull request #716 from delroth/vertex-loader
Make vertex loader testable
Diffstat (limited to 'Source/Core/DolphinWX/Main.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/Main.cpp | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/Source/Core/DolphinWX/Main.cpp b/Source/Core/DolphinWX/Main.cpp index 0dfc76d01b..68aa986a8d 100644 --- a/Source/Core/DolphinWX/Main.cpp +++ b/Source/Core/DolphinWX/Main.cpp @@ -46,6 +46,8 @@ #include "DolphinWX/Frame.h" #include "DolphinWX/Globals.h" #include "DolphinWX/Main.h" +#include "DolphinWX/SoftwareVideoConfigDialog.h" +#include "DolphinWX/VideoConfigDiag.h" #include "DolphinWX/WxUtils.h" #include "DolphinWX/Debugger/CodeWindow.h" #include "DolphinWX/Debugger/JitWindow.h" @@ -686,3 +688,18 @@ void Host_ConnectWiimote(int wm_idx, bool connect) { CFrame::ConnectWiimote(wm_idx, connect); } + +void Host_ShowVideoConfig(void* parent, const std::string& backend_name, + const std::string& config_name) +{ + if (backend_name == "Direct3D" || backend_name == "OpenGL") + { + VideoConfigDiag diag((wxWindow*)parent, backend_name, config_name); + diag.ShowModal(); + } + else if (backend_name == "Software Renderer") + { + SoftwareVideoConfigDialog diag((wxWindow*)parent, backend_name, config_name); + diag.ShowModal(); + } +} |
