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

gsdx:windows: Don't refer to D3D10 

Direct3D11 is used even if the user's GPU only supports Direct3D feature
level 10.0.
This commit is contained in:
Jonathan Li 2018-08-22 17:53:09 +01:00
parent 05004450a0
commit e4dd0069ca
7 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/GSdx/GSSettingsDlg.cpp
View File

@ -346,7 +346,6 @@ void GSSettingsDlg::UpdateRenderers()
if(renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::DX1011_OpenCL)
{
if(level < D3D_FEATURE_LEVEL_10_0) continue;
r.name += (level >= D3D_FEATURE_LEVEL_11_0 ? "11" : "10");
}
renderers.push_back(r);
@ -374,7 +373,6 @@ void GSSettingsDlg::UpdateControls()
if(ComboBoxGetSelData(IDC_RENDERER, i))
{
GSRendererType renderer = static_cast<GSRendererType>(i);
D3D_FEATURE_LEVEL level = GSUtil::CheckDirect3D11Level();
bool dx9 = renderer == GSRendererType::DX9_HW || renderer == GSRendererType::DX9_SW || renderer == GSRendererType::DX9_OpenCL;
bool dx11 = renderer == GSRendererType::DX1011_HW || renderer == GSRendererType::DX1011_SW || renderer == GSRendererType::DX1011_OpenCL;
@ -386,8 +384,7 @@ void GSSettingsDlg::UpdateControls()
bool null = renderer == GSRendererType::Null;
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), (dx11 && level >= D3D_FEATURE_LEVEL_11_0) ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO10), (dx11 && level < D3D_FEATURE_LEVEL_11_0) ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_NULL), null ? SW_SHOW : SW_HIDE);
ShowWindow(GetDlgItem(m_hWnd, IDC_LOGOGL), ogl ? SW_SHOW : SW_HIDE);
#ifndef ENABLE_OPENCL

4
plugins/GSdx/GSdx.cpp
View File

@ -201,10 +201,10 @@ void GSdxApp::Init()
#ifdef _WIN32
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::DX9_HW), "Direct3D 9", "Hardware"));
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::DX1011_HW), "Direct3D ", "Hardware"));
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::DX1011_HW), "Direct3D 11", "Hardware"));
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::OGL_HW), "OpenGL", "Hardware"));
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::DX9_SW), "Direct3D 9", "Software"));
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::DX1011_SW), "Direct3D ", "Software"));
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::DX1011_SW), "Direct3D 11", "Software"));
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::OGL_SW), "OpenGL", "Software"));
#else // Linux
m_gs_renderers.push_back(GSSetting(static_cast<uint32>(GSRendererType::OGL_HW), "OpenGL", "Hardware"));

3
plugins/GSdx/GSdx.rc
View File

@ -101,8 +101,6 @@ IDR_TFX_FS_GLSL RCDATA "res\\glsl\\tfx_fs.glsl";
IDB_LOGO9 BITMAP "res\\logo9.bmp"
IDB_LOGO10 BITMAP "res\\logo10.bmp"
IDB_LOGO11 BITMAP "res\\logo11.bmp"
IDB_LOGOGL BITMAP "res\\logo-ogl.bmp"
@ -286,7 +284,6 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
// General Settings:
CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44
CONTROL IDB_LOGO10,IDC_LOGO10,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44
CONTROL IDB_LOGO11,IDC_LOGO11,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44
CONTROL IDB_LOGOGL,IDC_LOGOGL,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44
CONTROL IDB_NULL,IDC_NULL,"Static",SS_BITMAP | SS_REALSIZECONTROL,6,6,230,44

1
plugins/GSdx/GSdx.vcxproj
View File

@ -285,7 +285,6 @@
<ItemGroup>
<None Include="GSdx.def" />
<None Include="res\fxaa.fx" />
<None Include="res\logo10.bmp" />
<None Include="res\logo9.bmp" />
<None Include="res\logo_ogl.bmp" />
<None Include="res\convert.fx" />

3
plugins/GSdx/GSdx.vcxproj.filters
View File

@ -586,9 +586,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\logo10.bmp">
<Filter>Resource Files</Filter>
</None>
<None Include="res\logo9.bmp">
<Filter>Resource Files</Filter>
</None>

BIN
plugins/GSdx/res/logo10.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 73 KiB

2
plugins/GSdx/resource.h
View File

@ -6,12 +6,10 @@
#define IDD_CONFIG 2001
#define IDB_NULL 2002
#define IDB_LOGO9 2003
#define IDB_LOGO10 2004
#define IDB_LOGO11 2005
#define IDB_LOGOGL 2006
#define IDC_NULL 2007
#define IDC_LOGO9 2008
#define IDC_LOGO10 2009
#define IDC_LOGO11 2010
#define IDC_LOGOGL 2011
#define IDC_ADAPTER 2012