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

GSdx: Adjust some checks in the gui code. 

Now that d3d9 has been removed we can ease up and reduce/remove some
render variable checks.
This commit is contained in:
lightningterror 2019-01-02 03:11:47 +01:00
parent 549b438a84
commit 4cf3328682
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/GSdx/Window/GSSettingsDlg.cpp
View File

@ -296,14 +296,12 @@ void GSSettingsDlg::UpdateAdapters()
return; return;
const GSRendererType renderer = static_cast<GSRendererType>(data); const GSRendererType renderer = static_cast<GSRendererType>(data);
const bool ogl = renderer == GSRendererType::OGL_HW || renderer == GSRendererType::OGL_SW || renderer == GSRendererType::OGL_OpenCL;
const bool dx11 = renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::DX1011_OpenCL; const bool dx11 = renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::DX1011_OpenCL;
const bool null = renderer == GSRendererType::Null;
EnableWindow(GetDlgItem(m_hWnd, IDC_ADAPTER), !(ogl || null)); EnableWindow(GetDlgItem(m_hWnd, IDC_ADAPTER), dx11);
EnableWindow(GetDlgItem(m_hWnd, IDC_ADAPTER_TEXT), !(ogl || null)); EnableWindow(GetDlgItem(m_hWnd, IDC_ADAPTER_TEXT), dx11);
if (ogl || null) if (!dx11)
{ {
SendMessage(GetDlgItem(m_hWnd, IDC_ADAPTER), CB_RESETCONTENT, 0, 0); SendMessage(GetDlgItem(m_hWnd, IDC_ADAPTER), CB_RESETCONTENT, 0, 0);
return; return;
@ -614,7 +612,6 @@ void GSHacksDlg::OnInit()
unsigned short upscaling_multiplier = static_cast<unsigned short>(SendMessage(hwnd_upscaling, CB_GETITEMDATA, SendMessage(hwnd_upscaling, CB_GETCURSEL, 0, 0), 0)); unsigned short upscaling_multiplier = static_cast<unsigned short>(SendMessage(hwnd_upscaling, CB_GETITEMDATA, SendMessage(hwnd_upscaling, CB_GETCURSEL, 0, 0), 0));
// It can only be accessed with a HW renderer, so this is sufficient. // It can only be accessed with a HW renderer, so this is sufficient.
bool dx11 = renderer == GSRendererType::DX1011_HW;
bool ogl = renderer == GSRendererType::OGL_HW; bool ogl = renderer == GSRendererType::OGL_HW;
bool native = upscaling_multiplier == 1; bool native = upscaling_multiplier == 1;
bool msaadisabled = true; bool msaadisabled = true;
@ -666,7 +663,7 @@ void GSHacksDlg::OnInit()
// Direct3D-only hacks: // Direct3D-only hacks:
EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHASTENCIL), !ogl); EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHASTENCIL), !ogl);
EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHAHACK), dx11); EnableWindow(GetDlgItem(m_hWnd, IDC_ALPHAHACK), !ogl);
EnableWindow(GetDlgItem(m_hWnd, IDC_MSAACB), !msaadisabled); EnableWindow(GetDlgItem(m_hWnd, IDC_MSAACB), !msaadisabled);
EnableWindow(GetDlgItem(m_hWnd, IDC_MSAA_TEXT), !msaadisabled); EnableWindow(GetDlgItem(m_hWnd, IDC_MSAA_TEXT), !msaadisabled);