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

GS-wx: Gray out texture barriers and geometry shader options on d3d.

This commit is contained in:
lightningterror 2022-04-18 22:01:25 +02:00
parent ea0791a3bf
commit d42fb851a2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcsx2/GS/Window/GSwxDialog.cpp
View File

@ -547,6 +547,7 @@ DebugTab::DebugTab(wxWindow* parent)
PaddedBoxSizer<wxBoxSizer> tab_box(wxVERTICAL); PaddedBoxSizer<wxBoxSizer> tab_box(wxVERTICAL);
auto ogl_hw_prereq = [this]{ return m_is_ogl_hw; }; auto ogl_hw_prereq = [this]{ return m_is_ogl_hw; };
auto vk_ogl_hw_prereq = [this] { return m_is_ogl_hw || m_is_vk_hw; };
if (g_Conf->DevMode || IsDevBuild) if (g_Conf->DevMode || IsDevBuild)
{ {
@ -581,8 +582,8 @@ DebugTab::DebugTab(wxWindow* parent)
PaddedBoxSizer<wxStaticBoxSizer> ogl_box(wxVERTICAL, this, "Overrides"); PaddedBoxSizer<wxStaticBoxSizer> ogl_box(wxVERTICAL, this, "Overrides");
auto* ogl_grid = new wxFlexGridSizer(2, space, space); auto* ogl_grid = new wxFlexGridSizer(2, space, space);
m_ui.addComboBoxAndLabel(ogl_grid, "Texture Barriers:", "OverrideTextureBarriers", &theApp.m_gs_generic_list, -1); m_ui.addComboBoxAndLabel(ogl_grid, "Texture Barriers:", "OverrideTextureBarriers", &theApp.m_gs_generic_list, -1, vk_ogl_hw_prereq);
m_ui.addComboBoxAndLabel(ogl_grid, "Geometry Shader:", "OverrideGeometryShaders", &theApp.m_gs_generic_list, IDC_GEOMETRY_SHADER_OVERRIDE); m_ui.addComboBoxAndLabel(ogl_grid, "Geometry Shader:", "OverrideGeometryShaders", &theApp.m_gs_generic_list, IDC_GEOMETRY_SHADER_OVERRIDE, vk_ogl_hw_prereq);
m_ui.addComboBoxAndLabel(ogl_grid, "Image Load Store:", "override_GL_ARB_shader_image_load_store", &theApp.m_gs_generic_list, IDC_IMAGE_LOAD_STORE, ogl_hw_prereq); m_ui.addComboBoxAndLabel(ogl_grid, "Image Load Store:", "override_GL_ARB_shader_image_load_store", &theApp.m_gs_generic_list, IDC_IMAGE_LOAD_STORE, ogl_hw_prereq);
m_ui.addComboBoxAndLabel(ogl_grid, "Sparse Texture:", "override_GL_ARB_sparse_texture", &theApp.m_gs_generic_list, IDC_SPARSE_TEXTURE, ogl_hw_prereq); m_ui.addComboBoxAndLabel(ogl_grid, "Sparse Texture:", "override_GL_ARB_sparse_texture", &theApp.m_gs_generic_list, IDC_SPARSE_TEXTURE, ogl_hw_prereq);
ogl_box->Add(ogl_grid); ogl_box->Add(ogl_grid);
@ -801,6 +802,7 @@ void Dialog::Update()
m_renderer_panel->m_is_native_res = !is_hw || !is_upscale; m_renderer_panel->m_is_native_res = !is_hw || !is_upscale;
m_post_panel->m_is_vk_hw = renderer == GSRendererType::VK; m_post_panel->m_is_vk_hw = renderer == GSRendererType::VK;
m_debug_panel->m_is_ogl_hw = renderer == GSRendererType::OGL; m_debug_panel->m_is_ogl_hw = renderer == GSRendererType::OGL;
m_debug_panel->m_is_vk_hw = renderer == GSRendererType::VK;
m_ui.Update(); m_ui.Update();
m_hacks_panel->DoUpdate(); m_hacks_panel->DoUpdate();

1
pcsx2/GS/Window/GSwxDialog.h
View File

@ -133,6 +133,7 @@ namespace GSSettingsDialog
public: public:
GSUIElementHolder m_ui; GSUIElementHolder m_ui;
bool m_is_ogl_hw = false; bool m_is_ogl_hw = false;
bool m_is_vk_hw = false;
DebugTab(wxWindow* parent); DebugTab(wxWindow* parent);
void Load() { m_ui.Load(); } void Load() { m_ui.Load(); }