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

GS: Add system default adapter config option

This commit is contained in:
TellowKrinkle 2021-11-29 22:30:54 -06:00 committed by tellowkrinkle
parent 4e762c75b0
commit 6811cd617b
3 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pcsx2/GS/GSUtil.cpp
View File

@ -197,12 +197,11 @@ GSRendererType GSUtil::GetPreferredRenderer()
return GSRendererType::OGL_HW; return GSRendererType::OGL_HW;
} }
std::vector<std::string> GSUtil::GetAdapterList(GSRendererType renderer, size_t& default_adapter) std::vector<std::string> GSUtil::GetAdapterList(GSRendererType renderer)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (renderer == GSRendererType::DX1011_HW) if (renderer == GSRendererType::DX1011_HW)
{ {
default_adapter = 0;
auto factory = D3D::CreateFactory(false); auto factory = D3D::CreateFactory(false);
return D3D::GetAdapterList(factory.get()); return D3D::GetAdapterList(factory.get());
} }

2
pcsx2/GS/GSUtil.h
View File

@ -42,7 +42,7 @@ public:
static bool CheckSSE(); static bool CheckSSE();
static CRCHackLevel GetRecommendedCRCHackLevel(GSRendererType type); static CRCHackLevel GetRecommendedCRCHackLevel(GSRendererType type);
static GSRendererType GetPreferredRenderer(); static GSRendererType GetPreferredRenderer();
static std::vector<std::string> GetAdapterList(GSRendererType renderer, size_t& default_adapter); static std::vector<std::string> GetAdapterList(GSRendererType renderer);
}; };
#ifdef _WIN32 #ifdef _WIN32

38
pcsx2/GS/Window/GSwxDialog.cpp
View File

@ -686,31 +686,23 @@ void Dialog::RendererChange()
int current_sel = m_adapter_select->GetSelection(); int current_sel = m_adapter_select->GetSelection();
if (current_sel >= 0 && current_sel < static_cast<int>(m_adapter_arr_string.Count())) if (current_sel >= 0 && current_sel < static_cast<int>(m_adapter_arr_string.Count()))
current = m_adapter_arr_string[current_sel].ToUTF8(); current = m_adapter_arr_string[current_sel].ToUTF8();
bool explicitly_selected_default = m_adapter_arr_string.Count() > 1 && current_sel == 0;
size_t default_adapter = 0; std::vector<std::string> adapters = GSUtil::GetAdapterList(renderer);
std::vector<std::string> adapters = GSUtil::GetAdapterList(renderer, default_adapter);
m_adapter_select->Clear(); m_adapter_arr_string.Clear();
if (adapters.empty()) m_adapter_arr_string.Add(_("Default Adapter"));
int new_sel = theApp.GetConfigI("adapter_index") + 1;
if (new_sel < 0 || new_sel >= static_cast<int>(adapters.size() + 1) || explicitly_selected_default)
new_sel = 0;
for (std::string& adapter : adapters)
{ {
m_adapter_select->Disable(); if (adapter == current)
} new_sel = m_adapter_arr_string.Count();
else m_adapter_arr_string.Add(fromUTF8(adapter));
{
m_adapter_arr_string.Clear();
int new_sel = theApp.GetConfigI("adapter_index");
if (new_sel < 0 || new_sel >= static_cast<int>(adapters.size()))
new_sel = default_adapter;
for (std::string& adapter : adapters)
{
if (adapter == current)
new_sel = m_adapter_arr_string.Count();
m_adapter_arr_string.Add(fromUTF8(adapter));
}
m_adapter_select->Set(m_adapter_arr_string);
m_adapter_select->SetSelection(new_sel);
m_adapter_select->Enable();
} }
m_adapter_select->Set(m_adapter_arr_string);
m_adapter_select->SetSelection(new_sel);
#ifdef _WIN32 #ifdef _WIN32
m_renderer_panel->UpdateBlendMode(renderer); m_renderer_panel->UpdateBlendMode(renderer);
@ -741,8 +733,8 @@ void Dialog::Save()
m_ui.Save(); m_ui.Save();
// only save the adapter when it makes sense to // only save the adapter when it makes sense to
// prevents changing the adapter, switching to another renderer and saving // prevents changing the adapter, switching to another renderer and saving
if (m_adapter_select->GetCount()) if (m_adapter_select->GetCount() > 1) // First option is system default
theApp.SetConfig("adapter_index", m_adapter_select->GetSelection()); theApp.SetConfig("adapter_index", m_adapter_select->GetSelection() - 1);
m_hacks_panel->Save(); m_hacks_panel->Save();
m_renderer_panel->Save(); m_renderer_panel->Save();