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

* GUI Video-Settings changes:

Browse Source 
- Removed recent ghanges about separate per-game Video Settings
  - Added "One Window 3-State Support" (very close to full implementation)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7391 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
gnick79
2011-03-21 19:57:31 +00:00
parent d332cc342d
commit 017735b9ff
19 changed files with 930 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
View File

@ -9,9 +9,6 @@ namespace DX11
class VideoBackend : public VideoBackendHardware
{
public:
VideoBackend() : VideoBackendHardware("gfx_dx11") {}
bool Initialize(void *&);
void Shutdown();

7
Source/Plugins/Plugin_VideoDX11/Src/main.cpp
View File

@ -141,7 +141,7 @@ void VideoBackend::ShowConfig(void *_hParent)
// Clear ppshaders string vector
g_Config.backend_info.PPShaders.clear();
VideoConfigDiag diag((wxWindow*)_hParent, _trans("Direct3D11"));
VideoConfigDiag diag((wxWindow*)_hParent, _trans("Direct3D11"), "gfx_dx11");
diag.ShowModal();
g_Config.backend_info.Adapters.clear();
@ -156,8 +156,9 @@ bool VideoBackend::Initialize(void *&window_handle)
frameCount = 0;
LoadConfig();
g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx11.ini").c_str(), true,
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
UpdateProjectionHack(g_Config.iPhackvalue, g_Config.sPhackvalue);
UpdateActiveConfig();

3
Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h
View File

@ -9,9 +9,6 @@ namespace DX9
class VideoBackend : public VideoBackendHardware
{
public:
VideoBackend() : VideoBackendHardware("gfx_dx9") {}
bool Initialize(void *&);
void Shutdown();

9
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
View File

@ -123,7 +123,7 @@ void VideoBackend::ShowConfig(void* parent)
// Clear ppshaders string vector
g_Config.backend_info.PPShaders.clear();
VideoConfigDiag diag((wxWindow*)parent, _trans("Direct3D9"));
VideoConfigDiag diag((wxWindow*)parent, _trans("Direct3D9"), "gfx_dx9");
diag.ShowModal();
g_Config.backend_info.Adapters.clear();
@ -137,9 +137,10 @@ bool VideoBackend::Initialize(void *&window_handle)
frameCount = 0;
LoadConfig();
g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
UpdateProjectionHack(g_Config.iPhackvalue, g_Config.sPhackvalue); // DX9 projection hack could be disabled by commenting out this line
g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_dx9.ini").c_str(), true,
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
UpdateProjectionHack(g_Config.iPhackvalue, g_Config.sPhackvalue);
UpdateActiveConfig();
window_handle = (void*)EmuWindow::Create((HWND)window_handle, GetModuleHandle(0), _T("Loading - Please wait."));

3
Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
View File

@ -9,9 +9,6 @@ namespace OGL
class VideoBackend : public VideoBackendHardware
{
public:
VideoBackend() : VideoBackendHardware("gfx_opengl") {}
bool Initialize(void *&);
void Shutdown();

6
Source/Plugins/Plugin_VideoOGL/Src/main.cpp
View File

@ -149,7 +149,7 @@ void VideoBackend::ShowConfig(void *_hParent)
// pp shaders
GetShaders(g_Config.backend_info.PPShaders);
VideoConfigDiag diag((wxWindow*)_hParent, "OpenGL");
VideoConfigDiag diag((wxWindow*)_hParent, "OpenGL", "gfx_opengl");
diag.ShowModal();
#endif
}
@ -160,8 +160,8 @@ bool VideoBackend::Initialize(void *&window_handle)
frameCount = 0;
LoadConfig();
g_Config.GameIniLoad(SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
g_Config.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_opengl.ini").c_str(), true,
SConfig::GetInstance().m_LocalCoreStartupParameter.m_strGameIni.c_str());
g_Config.UpdateProjectionHack();

2
Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp
View File

@ -67,7 +67,7 @@ void VideoSoftware::ShowConfig(void *_hParent)
bool VideoSoftware::Initialize(void *&window_handle)
{
LoadConfig();
g_SWVideoConfig.Load((File::GetUserPath(D_CONFIG_IDX) + "gfx_software.ini").c_str());
if (!OpenGL_Create(window_handle))
{

3
Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
View File

@ -9,9 +9,6 @@ namespace SW
class VideoSoftware : public VideoBackend
{
public:
VideoSoftware() : VideoBackend("gfx_software") {}
bool Initialize(void *&);
void Shutdown();