diff --git a/plugins/GSdx/GPUSettingsDlg.cpp b/plugins/GSdx/GPUSettingsDlg.cpp index 243aad3653..28d8c96f1c 100644 --- a/plugins/GSdx/GPUSettingsDlg.cpp +++ b/plugins/GSdx/GPUSettingsDlg.cpp @@ -148,4 +148,4 @@ void GPUSettingsDlg::UpdateControls() EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw); EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS), sw); } -} \ No newline at end of file +} diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp index 66acafaf3e..da3165f83a 100644 --- a/plugins/GSdx/GSSettingsDlg.cpp +++ b/plugins/GSdx/GSSettingsDlg.cpp @@ -413,7 +413,7 @@ void GSSettingsDlg::UpdateControls() ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO9), dx9 ? SW_SHOW : SW_HIDE); ShowWindow(GetDlgItem(m_hWnd, IDC_LOGO11), dx11 ? SW_SHOW : SW_HIDE); - + ShowWindow(GetDlgItem(m_hWnd, IDC_LOGOGL), ogl ? SW_SHOW : SW_HIDE); EnableWindow(GetDlgItem(m_hWnd, IDC_OPENCL_DEVICE), ocl); EnableWindow(GetDlgItem(m_hWnd, IDC_WINDOWED), dx9); EnableWindow(GetDlgItem(m_hWnd, IDC_RESX), hw && !native && scaling == 1); diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index 28949db577..25d6bbb66a 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -82,6 +82,7 @@ IDR_TFX_CL RCDATA "res\\tfx.cl" IDB_LOGO9 BITMAP "res\\logo9.bmp" IDB_LOGO10 BITMAP "res\\logo10.bmp" +IDB_LOGOGL BITMAP "res\\logo-ogl.bmp" ///////////////////////////////////////////////////////////////////////////// // @@ -258,7 +259,8 @@ BEGIN CONTROL "Edge Anti-aliasing (AA1)",IDC_AA1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,319,93,10 PUSHBUTTON "Cancel",IDCANCEL,95,346,50,14 CONTROL IDB_LOGO9,IDC_LOGO9,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,175,44 - GROUPBOX "D3D Internal Resolution (can cause glitches)",IDC_STATIC,6,116,175,64,BS_CENTER + CONTROL IDB_LOGOGL,IDC_LOGOGL,"Static",SS_BITMAP | SS_CENTERIMAGE,6,6,175,42 + GROUPBOX "Internal Resolution (can cause glitches)",IDC_STATIC,6,116,175,64,BS_CENTER GROUPBOX "Software Mode Settings",IDC_STATIC,6,290,175,50,BS_CENTER GROUPBOX "Hardware Mode Settings",IDC_STATIC,6,214,175,74,BS_CENTER CONTROL "Logarithmic Z",IDC_LOGZ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,227,58,10 diff --git a/plugins/GSdx/GSdx.vcxproj b/plugins/GSdx/GSdx.vcxproj index 85817e5480..138508855d 100644 --- a/plugins/GSdx/GSdx.vcxproj +++ b/plugins/GSdx/GSdx.vcxproj @@ -1695,6 +1695,7 @@ + diff --git a/plugins/GSdx/GSdx.vcxproj.filters b/plugins/GSdx/GSdx.vcxproj.filters index dac8c69aea..3611bffba1 100644 --- a/plugins/GSdx/GSdx.vcxproj.filters +++ b/plugins/GSdx/GSdx.vcxproj.filters @@ -706,6 +706,9 @@ Resource Files + + Resource Files + Shaders diff --git a/plugins/GSdx/GSdx_vs2012.vcxproj b/plugins/GSdx/GSdx_vs2012.vcxproj index 98ee0f4fb5..d0cec99e73 100644 --- a/plugins/GSdx/GSdx_vs2012.vcxproj +++ b/plugins/GSdx/GSdx_vs2012.vcxproj @@ -2053,6 +2053,7 @@ + @@ -2072,4 +2073,4 @@ - \ No newline at end of file + diff --git a/plugins/GSdx/GSdx_vs2012.vcxproj.filters b/plugins/GSdx/GSdx_vs2012.vcxproj.filters index 1067b76f32..c3184c7306 100644 --- a/plugins/GSdx/GSdx_vs2012.vcxproj.filters +++ b/plugins/GSdx/GSdx_vs2012.vcxproj.filters @@ -714,6 +714,9 @@ Resource Files + + + Resource Files Shaders @@ -749,4 +752,4 @@ Resource Files - \ No newline at end of file + diff --git a/plugins/GSdx/GSdx_vs2013.vcxproj b/plugins/GSdx/GSdx_vs2013.vcxproj index 3b30a5bbb5..6d96bb38fb 100644 --- a/plugins/GSdx/GSdx_vs2013.vcxproj +++ b/plugins/GSdx/GSdx_vs2013.vcxproj @@ -2065,6 +2065,7 @@ + @@ -2085,4 +2086,4 @@ - \ No newline at end of file + diff --git a/plugins/GSdx/GSdx_vs2013.vcxproj.filters b/plugins/GSdx/GSdx_vs2013.vcxproj.filters index b0053934e9..4fcf5dd8e9 100644 --- a/plugins/GSdx/GSdx_vs2013.vcxproj.filters +++ b/plugins/GSdx/GSdx_vs2013.vcxproj.filters @@ -720,6 +720,9 @@ Resource Files + + + Resource Files Shaders @@ -758,4 +761,4 @@ Resource Files - \ No newline at end of file + diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index a03a1dcb77..8049cc5aa4 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -18,25 +18,27 @@ #define IDD_CONFIG 2020 #define IDB_LOGO9 2021 #define IDB_LOGO10 2022 -#define IDC_FBA 2023 -#define IDC_LOGO9 2024 -#define IDC_LOGO11 2025 -#define IDD_CAPTURE 2026 -#define IDD_GPUCONFIG 2027 -#define IDC_RENDERER 2029 -#define IDC_INTERLACE 2030 -#define IDC_ASPECTRATIO 2031 -#define IDC_ALPHAHACK 2032 -#define IDC_SWTHREADS 2033 -#define IDC_SCALE 2034 -#define IDC_UPSCALE_MULTIPLIER 2035 -#define IDC_BROWSE 2036 -#define IDC_OFFSETHACK 2037 -#define IDC_FILENAME 2038 -#define IDC_SKIPDRAWHACK 2039 -#define IDC_WIDTH 2040 -#define IDC_HEIGHT 2041 -#define IDC_CONFIGURE 2042 +#define IDB_LOGOGL 2023 +#define IDC_FBA 2024 +#define IDC_LOGO9 2025 +#define IDC_LOGO11 2026 +#define IDC_LOGOGL 2027 +#define IDD_CAPTURE 2028 +#define IDD_GPUCONFIG 2029 +#define IDC_RENDERER 2030 +#define IDC_INTERLACE 2031 +#define IDC_ASPECTRATIO 2032 +#define IDC_ALPHAHACK 2033 +#define IDC_SWTHREADS 2034 +#define IDC_SCALE 2035 +#define IDC_UPSCALE_MULTIPLIER 2036 +#define IDC_BROWSE 2037 +#define IDC_OFFSETHACK 2038 +#define IDC_FILENAME 2039 +#define IDC_SKIPDRAWHACK 2040 +#define IDC_WIDTH 2041 +#define IDC_HEIGHT 2042 +#define IDC_CONFIGURE 2043 #define IDC_WINDOWED 2046 #define IDC_SKIPDRAWHACKEDIT 2048 #define IDC_SPRITEHACK 2051