ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gsdx: Move renderer config loading from GSOpen2 to _GSOpen 

Some duplicate logic is avoided this way.
This commit is contained in:
Jonathan Li 2017-03-24 08:52:01 +00:00 committed by Gregory Hainaut
parent 6977658443
commit 94f2ad9263
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/GSdx/GS.cpp
View File

@ -211,9 +211,18 @@ static int _GSopen(void** dsp, const char* title, GSRendererType renderer, int t
GSDevice* dev = NULL; GSDevice* dev = NULL;
bool old_api = *dsp == NULL; bool old_api = *dsp == NULL;
// Fresh start up or config file changed
if(renderer == GSRendererType::Undefined) if(renderer == GSRendererType::Undefined)
{ {
renderer = static_cast<GSRendererType>(theApp.GetConfigI("Renderer")); renderer = static_cast<GSRendererType>(theApp.GetConfigI("Renderer"));
#ifdef _WIN32
if (renderer == GSRendererType::Default)
{
renderer = GSUtil::GetBestRenderer();
if (renderer == GSRendererType::OGL_HW)
theApp.SetConfig("crc_hack_level", static_cast<int>(CRCHackLevel::Partial));
}
#endif
} }
if(threads == -1) if(threads == -1)
@ -472,25 +481,12 @@ EXPORT_C_(int) GSopen2(void** dsp, uint32 flags)
bool toggle_state = !!(flags & 4); bool toggle_state = !!(flags & 4);
GSRendererType renderer = s_renderer; GSRendererType renderer = s_renderer;
// Fresh start up or config file changed
if (renderer == GSRendererType::Undefined) if (renderer != GSRendererType::Undefined && stored_toggle_state != toggle_state)
{
renderer = static_cast<GSRendererType>(theApp.GetConfigI("Renderer"));
#ifdef _WIN32
if (renderer == GSRendererType::Default)
{
renderer = GSUtil::GetBestRenderer();
if (renderer == GSRendererType::OGL_HW)
theApp.SetConfig("crc_hack_level", static_cast<int>(CRCHackLevel::Partial));
}
#endif
}
else if (stored_toggle_state != toggle_state)
{ {
#ifdef _WIN32 #ifdef _WIN32
GSRendererType best_sw_renderer = GSUtil::CheckDirect3D11Level() >= D3D_FEATURE_LEVEL_10_0 ? GSRendererType::DX1011_SW : GSRendererType::DX9_SW; GSRendererType best_sw_renderer = GSUtil::CheckDirect3D11Level() >= D3D_FEATURE_LEVEL_10_0 ? GSRendererType::DX1011_SW : GSRendererType::DX9_SW;
switch (renderer) { switch (renderer) {
// Use alternative renderer (SW if currently using HW renderer, and vice versa, keeping the same API and API version) // Use alternative renderer (SW if currently using HW renderer, and vice versa, keeping the same API and API version)
case GSRendererType::DX9_SW: renderer = GSRendererType::DX9_HW; break; case GSRendererType::DX9_SW: renderer = GSRendererType::DX9_HW; break;