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 b770a874cb..0000000000 Binary files a/plugins/GSdx/res/logo10.bmp and /dev/null differ 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