diff --git a/plugins/GSdx/GSdx.cpp b/plugins/GSdx/GSdx.cpp index b8607423a3..a5ef367829 100644 --- a/plugins/GSdx/GSdx.cpp +++ b/plugins/GSdx/GSdx.cpp @@ -263,8 +263,13 @@ void GSdxApp::Init() m_gs_trifilter.push_back(GSSetting(static_cast(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", "")); + 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_hack.push_back(GSSetting(0, "Off", "Default")); m_gs_hack.push_back(GSSetting(1, "Half", "")); diff --git a/plugins/GSdx/GSdx.h b/plugins/GSdx/GSdx.h index ab2214f7a3..16340e60ad 100644 --- a/plugins/GSdx/GSdx.h +++ b/plugins/GSdx/GSdx.h @@ -77,6 +77,7 @@ public: std::vector m_gs_bifilter; std::vector m_gs_trifilter; std::vector m_gs_gl_ext; + std::vector m_gs_gl_ext_sparsetext; std::vector m_gs_hack; std::vector m_gs_offset_hack; std::vector m_gs_hw_mipmapping; @@ -84,7 +85,7 @@ public: std::vector m_gs_acc_date_level; std::vector m_gs_acc_blend_level; std::vector m_gs_tv_shaders; - + // PSX std::vector m_gpu_renderers; std::vector m_gpu_filter; std::vector m_gpu_dithering; diff --git a/plugins/GSdx/Window/GSLinuxDialog.cpp b/plugins/GSdx/Window/GSLinuxDialog.cpp index 0f9062955b..8c9134850c 100644 --- a/plugins/GSdx/Window/GSLinuxDialog.cpp +++ b/plugins/GSdx/Window/GSLinuxDialog.cpp @@ -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, "override_GL_ARB_sparse_texture"); + GtkWidget* gl_sps_combo = CreateComboBoxFromVector(theApp.m_gs_gl_ext_sparsetext, "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); diff --git a/plugins/GSdx/Window/GSSettingsDlg.cpp b/plugins/GSdx/Window/GSSettingsDlg.cpp index 64a9dd455f..fb1c55153f 100644 --- a/plugins/GSdx/Window/GSSettingsDlg.cpp +++ b/plugins/GSdx/Window/GSSettingsDlg.cpp @@ -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, theApp.GetConfigI("override_GL_ARB_sparse_texture")); + ComboBoxInit(IDC_SPARSE_TEXTURE, theApp.m_gs_gl_ext_sparsetext, 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));