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

Revert "gsdx-gui: Use a separate drop down list for sparse texture." 

This reverts commit 61c4df0375.

It was a bad idea from the start.
This commit is contained in:
lightningterror 2019-02-20 17:42:28 +01:00
parent 61c4df0375
commit 80f8de5e0b
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/GSdx/GSdx.cpp
View File

@ -263,13 +263,8 @@ void GSdxApp::Init()
m_gs_trifilter.push_back(GSSetting(static_cast<uint32>(TriFiltering::Forced), "Trilinear", "Ultra/Slow"));
m_gs_gl_ext.push_back(GSSetting(-1, "Automatic", "Default"));
m_gs_gl_ext.push_back(GSSetting(0, "Force-Disabled", ""));
m_gs_gl_ext.push_back(GSSetting(1, "Force-Enabled", ""));
// FIXME: Temporary. Remove it once Sparse Texture is implemented properly and use m_gs_gl_ext.
m_gs_gl_ext_sparsetext.push_back(GSSetting(-1, "Automatic", ""));
m_gs_gl_ext_sparsetext.push_back(GSSetting(0, "Force-Disabled", "Default"));
m_gs_gl_ext_sparsetext.push_back(GSSetting(1, "Force-Enabled", ""));
m_gs_gl_ext.push_back(GSSetting(0, "Force-Disabled", ""));
m_gs_gl_ext.push_back(GSSetting(1, "Force-Enabled", ""));
m_gs_hack.push_back(GSSetting(0, "Off", "Default"));
m_gs_hack.push_back(GSSetting(1, "Half", ""));

3
plugins/GSdx/GSdx.h
View File

@ -77,7 +77,6 @@ public:
std::vector<GSSetting> m_gs_bifilter;
std::vector<GSSetting> m_gs_trifilter;
std::vector<GSSetting> m_gs_gl_ext;
std::vector<GSSetting> m_gs_gl_ext_sparsetext;
std::vector<GSSetting> m_gs_hack;
std::vector<GSSetting> m_gs_offset_hack;
std::vector<GSSetting> m_gs_hw_mipmapping;
@ -85,7 +84,7 @@ public:
std::vector<GSSetting> m_gs_acc_date_level;
std::vector<GSSetting> m_gs_acc_blend_level;
std::vector<GSSetting> m_gs_tv_shaders;
// PSX
std::vector<GSSetting> m_gpu_renderers;
std::vector<GSSetting> m_gpu_filter;
std::vector<GSSetting> m_gpu_dithering;

2
plugins/GSdx/Window/GSLinuxDialog.cpp
View File

@ -321,7 +321,7 @@ void populate_gl_table(GtkWidget* gl_table)
GtkWidget* gl_ils_label = left_label("Image Load Store:");
GtkWidget* gl_ils_combo = CreateComboBoxFromVector(theApp.m_gs_gl_ext, "override_GL_ARB_shader_image_load_store");
GtkWidget* gl_sps_label = left_label("Sparse Texture:");
GtkWidget* gl_sps_combo = CreateComboBoxFromVector(theApp.m_gs_gl_ext_sparsetext, "override_GL_ARB_sparse_texture");
GtkWidget* gl_sps_combo = CreateComboBoxFromVector(theApp.m_gs_gl_ext, "override_GL_ARB_sparse_texture");
AddTooltip(gl_gs_label, gl_gs_combo, IDC_GEOMETRY_SHADER_OVERRIDE);
AddTooltip(gl_ils_label, gl_ils_combo, IDC_IMAGE_LOAD_STORE);

2
plugins/GSdx/Window/GSSettingsDlg.cpp
View File

@ -632,7 +632,7 @@ void GSHacksDlg::OnInit()
ComboBoxInit(IDC_SPRITEHACK, theApp.m_gs_hack, theApp.GetConfigI("UserHacks_SpriteHack"));
ComboBoxInit(IDC_GEOMETRY_SHADER_OVERRIDE, theApp.m_gs_gl_ext, theApp.GetConfigI("override_geometry_shader"));
ComboBoxInit(IDC_IMAGE_LOAD_STORE, theApp.m_gs_gl_ext, theApp.GetConfigI("override_GL_ARB_shader_image_load_store"));
ComboBoxInit(IDC_SPARSE_TEXTURE, theApp.m_gs_gl_ext_sparsetext, theApp.GetConfigI("override_GL_ARB_sparse_texture"));
ComboBoxInit(IDC_SPARSE_TEXTURE, theApp.m_gs_gl_ext, theApp.GetConfigI("override_GL_ARB_sparse_texture"));
SendMessage(GetDlgItem(m_hWnd, IDC_SKIPDRAWOFFSET), UDM_SETRANGE, 0, MAKELPARAM(10000, 0));
SendMessage(GetDlgItem(m_hWnd, IDC_SKIPDRAWOFFSET), UDM_SETPOS, 0, MAKELPARAM(theApp.GetConfigI("UserHacks_SkipDraw_Offset"), 0));