From de189b67a23d5c5e0108cf2011831c555260339c Mon Sep 17 00:00:00 2001 From: refractionpcsx2 Date: Wed, 10 Jun 2015 11:32:00 +0100 Subject: [PATCH] GSdx: Add option to toggle Texture Cache Depth support. - Forced off for DX currently to save fallover. --- plugins/GSdx/GSSettingsDlg.cpp | 6 +++++- plugins/GSdx/GSTextureCache.cpp | 4 ++-- plugins/GSdx/GSdx.rc | 3 ++- plugins/GSdx/GSdx_vs2013.vcxproj | 5 ++++- plugins/GSdx/GSdx_vs2013.vcxproj.filters | 13 +++++++++---- plugins/GSdx/resource.h | 4 +++- 6 files changed, 25 insertions(+), 10 deletions(-) diff --git a/plugins/GSdx/GSSettingsDlg.cpp b/plugins/GSdx/GSSettingsDlg.cpp index 9d101b15cb..84ecb71264 100644 --- a/plugins/GSdx/GSSettingsDlg.cpp +++ b/plugins/GSdx/GSSettingsDlg.cpp @@ -197,6 +197,7 @@ void GSSettingsDlg::OnInit() CheckDlgButton(m_hWnd, IDC_ACCURATE_BLEND, theApp.GetConfig("accurate_blend", 1)); CheckDlgButton(m_hWnd, IDC_ACCURATE_DATE, theApp.GetConfig("accurate_date", 0)); CheckDlgButton(m_hWnd, IDC_ACCURATE_COLCLIP, theApp.GetConfig("accurate_colclip", 0)); + CheckDlgButton(m_hWnd, IDC_OLGDEPTH, theApp.GetConfig("texture_cache_depth", 0)); // Shade Boost CheckDlgButton(m_hWnd, IDC_SHADEBOOST, theApp.GetConfig("ShadeBoost", 0)); @@ -334,7 +335,8 @@ bool GSSettingsDlg::OnCommand(HWND hWnd, UINT id, UINT code) theApp.SetConfig("accurate_blend", (int)IsDlgButtonChecked(m_hWnd, IDC_ACCURATE_BLEND)); theApp.SetConfig("accurate_date", (int)IsDlgButtonChecked(m_hWnd, IDC_ACCURATE_DATE)); theApp.SetConfig("accurate_colclip", (int)IsDlgButtonChecked(m_hWnd, IDC_ACCURATE_COLCLIP)); - + theApp.SetConfig("texture_cache_depth", (int)IsDlgButtonChecked(m_hWnd, IDC_OLGDEPTH)); + // Shade Boost theApp.SetConfig("ShadeBoost", (int)IsDlgButtonChecked(m_hWnd, IDC_SHADEBOOST)); @@ -438,6 +440,8 @@ void GSSettingsDlg::UpdateControls() EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_BLEND), ogl && hw); EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_DATE), ogl && hw); EnableWindow(GetDlgItem(m_hWnd, IDC_ACCURATE_COLCLIP), ogl && hw); + EnableWindow(GetDlgItem(m_hWnd, IDC_OLGDEPTH), ogl && hw); + //EnableWindow(GetDlgItem(m_hWnd, IDC_AA1), sw); // Let uers set software params regardless of renderer used //EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS_EDIT), sw); //EnableWindow(GetDlgItem(m_hWnd, IDC_SWTHREADS), sw); diff --git a/plugins/GSdx/GSTextureCache.cpp b/plugins/GSdx/GSTextureCache.cpp index b760380611..aa588250e3 100644 --- a/plugins/GSdx/GSTextureCache.cpp +++ b/plugins/GSdx/GSTextureCache.cpp @@ -30,8 +30,8 @@ GSTextureCache::GSTextureCache(GSRenderer* r) UserHacks_HalfPixelOffset = !!theApp.GetConfig("UserHacks", 0) && !!theApp.GetConfig("UserHacks_HalfPixelOffset", 0); m_paltex = !!theApp.GetConfig("paltex", 0); - m_can_convert_depth = theApp.GetConfig("texture_cache_depth", 1); - + m_can_convert_depth = theApp.GetConfig("Renderer", 12) == 12 ? theApp.GetConfig("texture_cache_depth", 1) : 0; + m_temp = (uint8*)_aligned_malloc(1024 * 1024 * sizeof(uint32), 32); } diff --git a/plugins/GSdx/GSdx.rc b/plugins/GSdx/GSdx.rc index a40d2d797c..565f45df5d 100644 --- a/plugins/GSdx/GSdx.rc +++ b/plugins/GSdx/GSdx.rc @@ -270,7 +270,7 @@ BEGIN CONTROL "Enable Shade Boost",IDC_SHADEBOOST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,186,79,10 CONTROL "Accurate Blend",IDC_ACCURATE_BLEND,"Button",BS_AUTO3STATE | WS_TABSTOP,10,259,67,10 CONTROL "Accurate Date",IDC_ACCURATE_DATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,259,67,10 - CONTROL "Accurate color clipping",IDC_ACCURATE_COLCLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,275,87,10 + CONTROL "Accurate color clip",IDC_ACCURATE_COLCLIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,275,74,10 PUSHBUTTON "Settings...",IDC_SHADEBUTTON,92,183,75,14 CONTROL "Enable HW Hacks",IDC_HACKS_ENABLED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,291,71,10 PUSHBUTTON "Configure...",IDC_HACKSBUTTON,92,288,75,14 @@ -282,6 +282,7 @@ BEGIN COMBOBOX IDC_AFCOMBO,93,304,35,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP LTEXT "OpenCL Device:",IDC_STATIC,6,86,52,8 COMBOBOX IDC_OPENCL_DEVICE,70,84,111,118,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "HW OGL Depth",IDC_OLGDEPTH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,92,273,72,13 END diff --git a/plugins/GSdx/GSdx_vs2013.vcxproj b/plugins/GSdx/GSdx_vs2013.vcxproj index 6d96bb38fb..5a19d0e464 100644 --- a/plugins/GSdx/GSdx_vs2013.vcxproj +++ b/plugins/GSdx/GSdx_vs2013.vcxproj @@ -2078,6 +2078,9 @@ + + + @@ -2086,4 +2089,4 @@ - + \ No newline at end of file diff --git a/plugins/GSdx/GSdx_vs2013.vcxproj.filters b/plugins/GSdx/GSdx_vs2013.vcxproj.filters index 4fcf5dd8e9..6e34f020dd 100644 --- a/plugins/GSdx/GSdx_vs2013.vcxproj.filters +++ b/plugins/GSdx/GSdx_vs2013.vcxproj.filters @@ -720,9 +720,6 @@ Resource Files - - - Resource Files Shaders @@ -755,10 +752,18 @@ Shaders + + Resource Files + Resource Files - + + + Resource Files + + + \ No newline at end of file diff --git a/plugins/GSdx/resource.h b/plugins/GSdx/resource.h index 977c06fbec..6e3efef2cf 100644 --- a/plugins/GSdx/resource.h +++ b/plugins/GSdx/resource.h @@ -79,6 +79,8 @@ #define IDC_ROUND_SPRITE 2095 #define IDC_ALIGN_SPRITE 2096 #define IDC_CRC_LEVEL 2097 +#define IDC_CHECK1 2098 +#define IDC_OLGDEPTH 2099 #define IDC_COLORSPACE 3000 #define IDR_CONVERT_FX 10000 #define IDR_TFX_FX 10001 @@ -99,7 +101,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 10013 #define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 2099 +#define _APS_NEXT_CONTROL_VALUE 2100 #define _APS_NEXT_SYMED_VALUE 5000 #endif #endif