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

Revert "Merge pull request #3076 from void-ghost/stereo3d_presets"

Browse Source 
This reverts commit 81414b4fa2, reversing
changes made to b926061f64.

Conflicts:
	Source/Core/DolphinWX/Frame.cpp
	Source/Core/VideoCommon/VideoConfig.cpp
	Source/Core/VideoCommon/VideoConfig.h
This commit is contained in:
Jules Blok
2015-12-23 00:35:19 +01:00
parent a55af16131
commit 8bda12bcfd
12 changed files with 10 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,6 @@ 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;

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

@ -65,11 +65,6 @@ std::string VideoBackend::GetDisplayName() const
return "Direct3D";
}
std::string VideoBackend::GetConfigName() const
{
return "gfx_dx11";
}
void InitBackendInfo()
{
HRESULT hr = DX11::D3D::LoadDXGI();
@ -148,7 +143,7 @@ void InitBackendInfo()
void VideoBackend::ShowConfig(void *hParent)
{
InitBackendInfo();
Host_ShowVideoConfig(hParent, GetDisplayName(), GetConfigName());
Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_dx11");
}
bool VideoBackend::Initialize(void *window_handle)
@ -161,7 +156,7 @@ bool VideoBackend::Initialize(void *window_handle)
frameCount = 0;
g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini");
g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini");
g_Config.GameIniLoad();
g_Config.UpdateProjectionHack();
g_Config.VerifyValidity();

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

@ -17,7 +17,6 @@ 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;

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

@ -103,11 +103,6 @@ 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"}, {
@ -148,7 +143,7 @@ void VideoBackend::ShowConfig(void *_hParent)
{
if (!s_BackendInitialized)
InitBackendInfo();
Host_ShowVideoConfig(_hParent, GetDisplayName(), GetConfigName());
Host_ShowVideoConfig(_hParent, GetDisplayName(), "gfx_opengl");
}
bool VideoBackend::Initialize(void *window_handle)
@ -158,7 +153,7 @@ bool VideoBackend::Initialize(void *window_handle)
frameCount = 0;
g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini");
g_Config.Load(File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini");
g_Config.GameIniLoad();
g_Config.UpdateProjectionHack();
g_Config.VerifyValidity();

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

@ -65,19 +65,14 @@ 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(), GetConfigName());
Host_ShowVideoConfig(hParent, GetDisplayName(), "gfx_software");
}
bool VideoSoftware::Initialize(void *window_handle)
{
g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + GetConfigName() + ".ini").c_str());
g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
SWOGLWindow::Init(window_handle);

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

@ -19,7 +19,6 @@ 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;