piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 06:39:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Isolate D3D and Software Renderer from wxWidgets code

Browse Source
This commit is contained in:
Lioncash
2014-08-03 20:07:27 -04:00
parent 35654513c1
commit a66a7e1344
11 changed files with 227 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/VideoBackends/D3D/main.cpp
View File

@ -3,7 +3,6 @@
// Refer to the license.txt file included.
#include <string>
#include <wx/wx.h>
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
@ -14,9 +13,6 @@
#include "Core/Core.h"
#include "Core/Host.h"
#include "DolphinWX/VideoConfigDiag.h"
#include "DolphinWX/Debugger/DebuggerPanel.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/Globals.h"
@ -139,13 +135,10 @@ void InitBackendInfo()
DX11::D3D::UnloadD3D();
}
void VideoBackend::ShowConfig(void *_hParent)
void VideoBackend::ShowConfig(void *hParent)
{
#if defined(HAVE_WX) && HAVE_WX
InitBackendInfo();
VideoConfigDiag diag((wxWindow*)_hParent, _trans("Direct3D"), "gfx_dx11");
diag.ShowModal();
#endif
Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_dx11");
}
bool VideoBackend::Initialize(void *&window_handle)

2
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -157,7 +157,7 @@ static void InitBackendInfo()
void VideoBackend::ShowConfig(void *_hParent)
{
InitBackendInfo();
Host_ShowVideoConfig(_hParent, "OpenGL", "gfx_opengl");
Host_ShowVideoConfig(_hParent, GetDisplayName(), "gfx_opengl");
}
bool VideoBackend::Initialize(void *&window_handle)

15
Source/Core/VideoBackends/Software/SWmain.cpp
View File

@ -33,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"
@ -62,12 +58,17 @@ static std::mutex m_csSWVidOccupied;
std::string VideoSoftware::GetName() const
{
return _trans("Software Renderer");
return "Software Renderer";
}
void VideoSoftware::ShowConfig(void *_hParent)
std::string VideoSoftware::GetDisplayName() const
{
Host_ShowVideoConfig(_hParent, "Software", "gfx_software");
return "Software Renderer";
}
void VideoSoftware::ShowConfig(void *hParent)
{
Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software");
}
bool VideoSoftware::Initialize(void *&window_handle)

2
Source/Core/VideoBackends/Software/Software.vcxproj
View File

@ -59,7 +59,6 @@
<ClCompile Include="TextureEncoder.cpp" />
<ClCompile Include="TextureSampler.cpp" />
<ClCompile Include="TransformUnit.cpp" />
<ClCompile Include="VideoConfigDialog.cpp" />
<ClCompile Include="XFMemLoader.cpp" />
</ItemGroup>
<ItemGroup>
@ -87,7 +86,6 @@
<ClInclude Include="TransformUnit.h" />
<ClInclude Include="Vec3.h" />
<ClInclude Include="VideoBackend.h" />
<ClInclude Include="VideoConfigDialog.h" />
<ClInclude Include="XFMemLoader.h" />
</ItemGroup>
<ItemGroup>

1
Source/Core/VideoBackends/Software/VideoBackend.h
View File

@ -14,6 +14,7 @@ class VideoSoftware : public VideoBackend
void Shutdown() override;
std::string GetName() const override;
std::string GetDisplayName() const override;
void EmuStateChange(EMUSTATE_CHANGE newState) override;