From e4dd0069ca5b3ce7934202adbe9be416438ff2cf Mon Sep 17 00:00:00 2001 From: Jonathan Li Date: Wed, 22 Aug 2018 17:53:09 +0100 Subject: [PATCH] gsdx:windows: Don't refer to D3D10 Direct3D11 is used even if the user's GPU only supports Direct3D feature level 10.0. --- plugins/GSdx/GSSettingsDlg.cpp | 5 +---- plugins/GSdx/GSdx.cpp | 4 ++-- plugins/GSdx/GSdx.rc | 3 --- plugins/GSdx/GSdx.vcxproj | 1 - plugins/GSdx/GSdx.vcxproj.filters | 3 --- plugins/GSdx/res/logo10.bmp | Bin 74646 -> 0 bytes plugins/GSdx/resource.h | 2 -- 7 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 plugins/GSdx/res/logo10.bmp diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp index 7c38fcb795..1a4b73caf8 100644 --- a/plugins/GSdx/GSSettingsDlg.cpp +++ b/plugins/GSdx/GSSettingsDlg.cpp @@ -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(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 diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp index a237f64ebc..9ef606a848 100644 --- a/plugins/GSdx/GSdx.cpp +++ b/plugins/GSdx/GSdx.cpp @@ -201,10 +201,10 @@ void GSdxApp::Init() #ifdef _WIN32 m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_HW), "Direct3D 9", "Hardware")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_HW), "Direct3D ", "Hardware")); + m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_HW), "Direct3D 11", "Hardware")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_HW), "OpenGL", "Hardware")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX9_SW), "Direct3D 9", "Software")); - m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_SW), "Direct3D ", "Software")); + m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::DX1011_SW), "Direct3D 11", "Software")); m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_SW), "OpenGL", "Software")); #else // Linux m_gs_renderers.push_back(GSSetting(static_cast(GSRendererType::OGL_HW), "OpenGL", "Hardware")); diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index 5817dcdb35..d5ff68d1e9 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -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 diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj index 803f89c771..421acd2d54 100644 --- a/plugins/GSdx/GSdx.vcxproj +++ b/plugins/GSdx/GSdx.vcxproj @@ -285,7 +285,6 @@ - diff --git a/plugins/GSdx/GSdx.vcxproj.filters b/plugins/GSdx/GSdx.vcxproj.filters index 9a6989dfbb..f38241a19d 100644 --- a/plugins/GSdx/GSdx.vcxproj.filters +++ b/plugins/GSdx/GSdx.vcxproj.filters @@ -586,9 +586,6 @@ - - Resource Files - Resource Files diff --git a/plugins/GSdx/res/logo10.bmp b/plugins/GSdx/res/logo10.bmp deleted file mode 100644 index b770a874cbee4379308cbb34e518c9df94e0a19b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 74646 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 diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index e10fb1f80c..8a437aa8cf 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -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