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/VideoBackends/Software/SWmain.cpp | |
| parent | 89adfba67bdf145ad0eae174cbe755f9aa7aa802 (diff) | |
| parent | 1fcf07f9cccf838894bf7a869ec0749cf2abbb2d (diff) | |
Merge pull request #716 from delroth/vertex-loader
Make vertex loader testable
Diffstat (limited to 'Source/Core/VideoBackends/Software/SWmain.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Software/SWmain.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp index c4a6d2f0c8..415fa0547b 100644 --- a/Source/Core/VideoBackends/Software/SWmain.cpp +++ b/Source/Core/VideoBackends/Software/SWmain.cpp @@ -12,9 +12,11 @@ #include "Core/ConfigManager.h" #include "Core/Core.h" +#include "Core/Host.h" #include "Core/HW/Memmap.h" #include "Core/HW/VideoInterface.h" +#include "VideoBackends/OGL/GLInterfaceBase.h" #include "VideoBackends/OGL/GLExtensions/GLExtensions.h" #include "VideoBackends/Software/BPMemLoader.h" #include "VideoBackends/Software/Clipper.h" @@ -31,10 +33,6 @@ #include "VideoBackends/Software/VideoBackend.h" #include "VideoBackends/Software/XFMemLoader.h" -#if defined(HAVE_WX) && HAVE_WX -#include "VideoBackends/Software/VideoConfigDialog.h" -#endif // HAVE_WX - #include "VideoCommon/Fifo.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/PixelEngine.h" @@ -60,15 +58,17 @@ static std::mutex m_csSWVidOccupied; std::string VideoSoftware::GetName() const { - return _trans("Software Renderer"); + return "Software Renderer"; +} + +std::string VideoSoftware::GetDisplayName() const +{ + return "Software Renderer"; } -void VideoSoftware::ShowConfig(void *_hParent) +void VideoSoftware::ShowConfig(void *hParent) { -#if defined(HAVE_WX) && HAVE_WX - VideoConfigDialog diag((wxWindow*)_hParent, "Software", "gfx_software"); - diag.ShowModal(); -#endif + Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software"); } bool VideoSoftware::Initialize(void *&window_handle) |