From 441f26706e280cd36529c0d69f2b9e99089ddb0c Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sun, 13 Sep 2020 22:24:20 +1000
Subject: [PATCH] Qt: Move post processing to its own setting category

---
 src/core/host_interface.cpp                   |   1 +
 src/core/settings.cpp                         |   2 +
 src/core/settings.h                           |   1 +
 src/duckstation-qt/CMakeLists.txt             |   3 +
 src/duckstation-qt/displaysettingswidget.cpp  |  19 ---
 src/duckstation-qt/displaysettingswidget.ui   |  34 +---
 src/duckstation-qt/duckstation-qt.vcxproj     |   6 +
 src/duckstation-qt/mainwindow.cpp             |   2 +
 src/duckstation-qt/mainwindow.ui              |  10 ++
 .../postprocessingchainconfigwidget.cpp       |  61 +++++--
 .../postprocessingchainconfigwidget.h         |   8 +-
 .../postprocessingchainconfigwidget.ui        | 136 +++++++++------
 .../postprocessingsettingswidget.cpp          | 103 +++++++++++
 .../postprocessingsettingswidget.h            |  33 ++++
 .../postprocessingsettingswidget.ui           | 160 ++++++++++++++++++
 .../postprocessingshaderconfigwidget.cpp      |  57 +++++--
 .../postprocessingshaderconfigwidget.h        |  30 +++-
 .../resources/icons/applications-graphics.png | Bin 0 -> 1808 bytes
 .../icons/applications-graphics@2x.png        | Bin 0 -> 4093 bytes
 src/duckstation-qt/resources/resources.qrc    |   2 +
 src/duckstation-qt/settingsdialog.cpp         |   6 +
 src/duckstation-qt/settingsdialog.h           |   4 +
 src/duckstation-qt/settingsdialog.ui          |   9 +
 src/frontend-common/common_host_interface.cpp |  18 +-
 24 files changed, 555 insertions(+), 150 deletions(-)
 create mode 100644 src/duckstation-qt/postprocessingsettingswidget.cpp
 create mode 100644 src/duckstation-qt/postprocessingsettingswidget.h
 create mode 100644 src/duckstation-qt/postprocessingsettingswidget.ui
 create mode 100644 src/duckstation-qt/resources/icons/applications-graphics.png
 create mode 100644 src/duckstation-qt/resources/icons/applications-graphics@2x.png

diff --git a/src/core/host_interface.cpp b/src/core/host_interface.cpp
index 7d378cf92..600b94bd5 100644
--- a/src/core/host_interface.cpp
+++ b/src/core/host_interface.cpp
@@ -389,6 +389,7 @@ void HostInterface::SetDefaultSettings(SettingsInterface& si)
                     Settings::GetDisplayAspectRatioName(Settings::DEFAULT_DISPLAY_ASPECT_RATIO));
   si.SetBoolValue("Display", "LinearFiltering", true);
   si.SetBoolValue("Display", "IntegerScaling", false);
+  si.SetBoolValue("Display", "PostProcessing", false);
   si.SetBoolValue("Display", "ShowOSDMessages", true);
   si.SetBoolValue("Display", "ShowFPS", false);
   si.SetBoolValue("Display", "ShowVPS", false);
diff --git a/src/core/settings.cpp b/src/core/settings.cpp
index f82e3ecce..d62439e34 100644
--- a/src/core/settings.cpp
+++ b/src/core/settings.cpp
@@ -129,6 +129,7 @@ void Settings::Load(SettingsInterface& si)
   display_active_end_offset = static_cast<s16>(si.GetIntValue("Display", "ActiveEndOffset", 0));
   display_linear_filtering = si.GetBoolValue("Display", "LinearFiltering", true);
   display_integer_scaling = si.GetBoolValue("Display", "IntegerScaling", false);
+  display_post_processing = si.GetBoolValue("Display", "PostProcessing", false);
   display_show_osd_messages = si.GetBoolValue("Display", "ShowOSDMessages", true);
   display_show_fps = si.GetBoolValue("Display", "ShowFPS", false);
   display_show_vps = si.GetBoolValue("Display", "ShowVPS", false);
@@ -239,6 +240,7 @@ void Settings::Save(SettingsInterface& si) const
   si.SetStringValue("Display", "AspectRatio", GetDisplayAspectRatioName(display_aspect_ratio));
   si.SetBoolValue("Display", "LinearFiltering", display_linear_filtering);
   si.SetBoolValue("Display", "IntegerScaling", display_integer_scaling);
+  si.SetBoolValue("Display", "PostProcessing", display_post_processing);
   si.SetBoolValue("Display", "ShowOSDMessages", display_show_osd_messages);
   si.SetBoolValue("Display", "ShowFPS", display_show_fps);
   si.SetBoolValue("Display", "ShowVPS", display_show_vps);
diff --git a/src/core/settings.h b/src/core/settings.h
index 3892718ea..08373fd1c 100644
--- a/src/core/settings.h
+++ b/src/core/settings.h
@@ -106,6 +106,7 @@ struct Settings
   DisplayAspectRatio display_aspect_ratio = DisplayAspectRatio::R4_3;
   bool display_linear_filtering = true;
   bool display_integer_scaling = false;
+  bool display_post_processing = false;
   bool display_show_osd_messages = false;
   bool display_show_fps = false;
   bool display_show_vps = false;
diff --git a/src/duckstation-qt/CMakeLists.txt b/src/duckstation-qt/CMakeLists.txt
index 3d265f20b..776abe4de 100644
--- a/src/duckstation-qt/CMakeLists.txt
+++ b/src/duckstation-qt/CMakeLists.txt
@@ -57,6 +57,9 @@ set(SRCS
   postprocessingchainconfigwidget.cpp
   postprocessingchainconfigwidget.h
   postprocessingchainconfigwidget.ui
+  postprocessingsettingswidget.cpp
+  postprocessingsettingswidget.h
+  postprocessingsettingswidget.ui
   postprocessingshaderconfigwidget.cpp
   postprocessingshaderconfigwidget.h
   qtdisplaywidget.cpp
diff --git a/src/duckstation-qt/displaysettingswidget.cpp b/src/duckstation-qt/displaysettingswidget.cpp
index 2c3f5243f..26b276278 100644
--- a/src/duckstation-qt/displaysettingswidget.cpp
+++ b/src/duckstation-qt/displaysettingswidget.cpp
@@ -47,25 +47,6 @@ DisplaySettingsWidget::DisplaySettingsWidget(QtHostInterface* host_interface, QW
           &DisplaySettingsWidget::onGPUAdapterIndexChanged);
   populateGPUAdapters();
 
-  {
-    std::string post_chain = g_host_interface->GetStringSettingValue("Display", "PostProcessChain");
-    if (!post_chain.empty() && !m_ui.postChain->setConfigString(post_chain))
-    {
-      QMessageBox::critical(this, tr("Error"),
-                            tr("The current post-processing chain is invalid, it has been reset. Any changes made will "
-                               "overwrite the existing config."));
-    }
-  }
-  connect(m_ui.postChain, &PostProcessingChainConfigWidget::chainConfigStringChanged,
-          [this](const std::string& new_config) {
-            if (new_config.empty())
-              m_host_interface->RemoveSettingValue("Display", "PostProcessChain");
-            else
-              m_host_interface->SetStringSettingValue("Display", "PostProcessChain", new_config.c_str());
-
-            m_host_interface->applySettings();
-          });
-
   dialog->registerWidgetHelp(
     m_ui.renderer, tr("Renderer"), Settings::GetRendererDisplayName(Settings::DEFAULT_GPU_RENDERER),
     tr("Chooses the backend to use for rendering the console/game visuals. <br>Depending on your system and hardware, "
diff --git a/src/duckstation-qt/displaysettingswidget.ui b/src/duckstation-qt/displaysettingswidget.ui
index 0e11fbfa8..8deae5e13 100644
--- a/src/duckstation-qt/displaysettingswidget.ui
+++ b/src/duckstation-qt/displaysettingswidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>448</width>
-    <height>720</height>
+    <height>430</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -153,30 +153,6 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox_2">
-     <property name="title">
-      <string>Post-Processing Chain</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="leftMargin">
-       <number>0</number>
-      </property>
-      <property name="topMargin">
-       <number>0</number>
-      </property>
-      <property name="rightMargin">
-       <number>0</number>
-      </property>
-      <property name="bottomMargin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="PostProcessingChainConfigWidget" name="postChain" native="true"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
@@ -192,14 +168,6 @@
    </item>
   </layout>
  </widget>
- <customwidgets>
-  <customwidget>
-   <class>PostProcessingChainConfigWidget</class>
-   <extends>QWidget</extends>
-   <header>duckstation-qt/postprocessingchainconfigwidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
  <resources/>
  <connections/>
 </ui>
diff --git a/src/duckstation-qt/duckstation-qt.vcxproj b/src/duckstation-qt/duckstation-qt.vcxproj
index 9598d1651..3dc78fe92 100644
--- a/src/duckstation-qt/duckstation-qt.vcxproj
+++ b/src/duckstation-qt/duckstation-qt.vcxproj
@@ -58,6 +58,7 @@
     <ClCompile Include="memorycardsettingswidget.cpp" />
     <ClCompile Include="postprocessingchainconfigwidget.cpp" />
     <ClCompile Include="postprocessingshaderconfigwidget.cpp" />
+    <ClCompile Include="postprocessingsettingswidget.cpp" />
     <ClCompile Include="qthostinterface.cpp" />
     <ClCompile Include="qtprogresscallback.cpp" />
     <ClCompile Include="qtutils.cpp" />
@@ -88,6 +89,7 @@
     <QtMoc Include="gamepropertiesdialog.h" />
     <QtMoc Include="postprocessingchainconfigwidget.h" />
     <QtMoc Include="postprocessingshaderconfigwidget.h" />
+    <QtMoc Include="postprocessingsettingswidget.h" />
     <QtMoc Include="mainwindow.h" />
     <QtMoc Include="qthostinterface.h" />
     <ClInclude Include="qtutils.h" />
@@ -150,6 +152,9 @@
     <QtUi Include="postprocessingchainconfigwidget.ui">
       <FileType>Document</FileType>
     </QtUi>
+    <QtUi Include="postprocessingsettingswidget.ui">
+      <FileType>Document</FileType>
+    </QtUi>
   </ItemGroup>
   <ItemGroup>
     <QtResource Include="resources\resources.qrc">
@@ -178,6 +183,7 @@
     <ClCompile Include="$(IntDir)moc_memorycardsettingswidget.cpp" />
     <ClCompile Include="$(IntDir)moc_postprocessingchainconfigwidget.cpp" />
     <ClCompile Include="$(IntDir)moc_postprocessingshaderconfigwidget.cpp" />
+    <ClCompile Include="$(IntDir)moc_postprocessingsettingswidget.cpp" />
     <ClCompile Include="$(IntDir)moc_qtdisplaywidget.cpp" />
     <ClCompile Include="$(IntDir)moc_qthostinterface.cpp" />
     <ClCompile Include="$(IntDir)moc_qtprogresscallback.cpp" />
diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp
index 3e62e9bca..ccd342957 100644
--- a/src/duckstation-qt/mainwindow.cpp
+++ b/src/duckstation-qt/mainwindow.cpp
@@ -664,6 +664,8 @@ void MainWindow::connectSignals()
           [this]() { doSettings(SettingsDialog::Category::DisplaySettings); });
   connect(m_ui.actionEnhancementSettings, &QAction::triggered,
           [this]() { doSettings(SettingsDialog::Category::EnhancementSettings); });
+  connect(m_ui.actionPostProcessingSettings, &QAction::triggered,
+          [this]() { doSettings(SettingsDialog::Category::PostProcessingSettings); });
   connect(m_ui.actionAudioSettings, &QAction::triggered,
           [this]() { doSettings(SettingsDialog::Category::AudioSettings); });
   connect(m_ui.actionAdvancedSettings, &QAction::triggered,
diff --git a/src/duckstation-qt/mainwindow.ui b/src/duckstation-qt/mainwindow.ui
index f4c5c105c..a229b8b73 100644
--- a/src/duckstation-qt/mainwindow.ui
+++ b/src/duckstation-qt/mainwindow.ui
@@ -122,6 +122,7 @@
     <addaction name="actionMemoryCardSettings"/>
     <addaction name="actionDisplaySettings"/>
     <addaction name="actionEnhancementSettings"/>
+    <addaction name="actionPostProcessingSettings"/>
     <addaction name="actionAudioSettings"/>
     <addaction name="actionAdvancedSettings"/>
     <addaction name="separator"/>
@@ -359,6 +360,15 @@
     <string>&amp;Enhancement Settings...</string>
    </property>
   </action>
+  <action name="actionPostProcessingSettings">
+   <property name="icon">
+    <iconset resource="resources/icons.qrc">
+     <normaloff>:/icons/applications-graphics.png</normaloff>:/icons/applications-graphics.png</iconset>
+   </property>
+   <property name="text">
+    <string>&amp;Post-Processing Settings...</string>
+   </property>
+  </action>
   <action name="actionFullscreen">
    <property name="icon">
     <iconset resource="resources/icons.qrc">
diff --git a/src/duckstation-qt/postprocessingchainconfigwidget.cpp b/src/duckstation-qt/postprocessingchainconfigwidget.cpp
index ce4e13e26..7050c0d3f 100644
--- a/src/duckstation-qt/postprocessingchainconfigwidget.cpp
+++ b/src/duckstation-qt/postprocessingchainconfigwidget.cpp
@@ -10,25 +10,26 @@ PostProcessingChainConfigWidget::PostProcessingChainConfigWidget(QWidget* parent
 {
   m_ui.setupUi(this);
   connectUi();
-  updateButtonStates();
+  updateButtonStates(std::nullopt);
 }
 
 PostProcessingChainConfigWidget::~PostProcessingChainConfigWidget() = default;
 
 void PostProcessingChainConfigWidget::connectUi()
 {
-  connect(m_ui.add, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onAddButtonClicked);
-  connect(m_ui.remove, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onRemoveButtonClicked);
-  connect(m_ui.clear, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onClearButtonClicked);
-  connect(m_ui.moveUp, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onMoveUpButtonClicked);
-  connect(m_ui.moveDown, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onMoveDownButtonClicked);
-  connect(m_ui.reload, &QPushButton::clicked, this, &PostProcessingChainConfigWidget::onReloadButtonClicked);
-  connect(m_ui.shaderSettings, &QPushButton::clicked, this,
+  connect(m_ui.add, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onAddButtonClicked);
+  connect(m_ui.remove, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onRemoveButtonClicked);
+  connect(m_ui.clear, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onClearButtonClicked);
+  connect(m_ui.moveUp, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onMoveUpButtonClicked);
+  connect(m_ui.moveDown, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onMoveDownButtonClicked);
+  // connect(m_ui.reload, &QToolButton::clicked, this, &PostProcessingChainConfigWidget::onReloadButtonClicked);
+  connect(m_ui.shaderSettings, &QToolButton::clicked, this,
           &PostProcessingChainConfigWidget::onShaderConfigButtonClicked);
-  connect(m_ui.shaders, &QListWidget::itemSelectionChanged, this, &PostProcessingChainConfigWidget::updateButtonStates);
+  connect(m_ui.shaders, &QListWidget::itemSelectionChanged, this,
+          &PostProcessingChainConfigWidget::onSelectedShaderChanged);
 
-  m_ui.loadPreset->setEnabled(false);
-  m_ui.savePreset->setEnabled(false);
+  // m_ui.loadPreset->setEnabled(false);
+  // m_ui.savePreset->setEnabled(false);
 }
 
 bool PostProcessingChainConfigWidget::setConfigString(const std::string_view& config_string)
@@ -40,6 +41,20 @@ bool PostProcessingChainConfigWidget::setConfigString(const std::string_view& co
   return true;
 }
 
+void PostProcessingChainConfigWidget::setOptionsButtonVisible(bool visible)
+{
+  if (visible)
+  {
+    m_ui.shaderSettings->setVisible(true);
+    m_ui.horizontalLayout->addWidget(m_ui.shaderSettings);
+  }
+  else
+  {
+    m_ui.shaderSettings->setVisible(false);
+    m_ui.horizontalLayout->removeWidget(m_ui.shaderSettings);
+  }
+}
+
 std::optional<u32> PostProcessingChainConfigWidget::getSelectedIndex() const
 {
   QList<QListWidgetItem*> selected_items = m_ui.shaders->selectedItems();
@@ -59,7 +74,7 @@ void PostProcessingChainConfigWidget::updateList()
     item->setData(Qt::UserRole, QVariant(i));
   }
 
-  updateButtonStates();
+  updateButtonStates(std::nullopt);
 }
 
 void PostProcessingChainConfigWidget::configChanged()
@@ -70,12 +85,11 @@ void PostProcessingChainConfigWidget::configChanged()
     chainConfigStringChanged(m_chain.GetConfigString());
 }
 
-void PostProcessingChainConfigWidget::updateButtonStates()
+void PostProcessingChainConfigWidget::updateButtonStates(std::optional<u32> index)
 {
-  std::optional<u32> index = getSelectedIndex();
   m_ui.remove->setEnabled(index.has_value());
   m_ui.clear->setEnabled(!m_chain.IsEmpty());
-  m_ui.reload->setEnabled(!m_chain.IsEmpty());
+  // m_ui.reload->setEnabled(!m_chain.IsEmpty());
   m_ui.shaderSettings->setEnabled(index.has_value() && (index.value() < m_chain.GetStageCount()) &&
                                   m_chain.GetShaderStage(index.value()).HasOptions());
 
@@ -106,6 +120,8 @@ void PostProcessingChainConfigWidget::onAddButtonClicked()
     {
       QAction* action = menu.addAction(QString::fromStdString(shader));
       connect(action, &QAction::triggered, [this, &shader]() {
+        chainAboutToChange();
+
         if (!m_chain.AddStage(shader))
         {
           QMessageBox::critical(this, tr("Error"), tr("Failed to add shader. The log may contain more information."));
@@ -131,6 +147,7 @@ void PostProcessingChainConfigWidget::onRemoveButtonClicked()
   u32 index = item->data(Qt::UserRole).toUInt();
   if (index < m_chain.GetStageCount())
   {
+    chainAboutToChange();
     m_chain.RemoveStage(index);
     updateList();
     configChanged();
@@ -142,6 +159,7 @@ void PostProcessingChainConfigWidget::onClearButtonClicked()
   if (QMessageBox::question(this, tr("Question"), tr("Are you sure you want to clear all shader stages?"),
                             QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes)
   {
+    chainAboutToChange();
     m_chain.ClearStages();
     updateList();
     configChanged();
@@ -153,6 +171,7 @@ void PostProcessingChainConfigWidget::onMoveUpButtonClicked()
   std::optional<u32> index = getSelectedIndex();
   if (index.has_value())
   {
+    chainAboutToChange();
     m_chain.MoveStageUp(index.value());
     updateList();
     configChanged();
@@ -164,6 +183,7 @@ void PostProcessingChainConfigWidget::onMoveDownButtonClicked()
   std::optional<u32> index = getSelectedIndex();
   if (index.has_value())
   {
+    chainAboutToChange();
     m_chain.MoveStageDown(index.value());
     updateList();
     configChanged();
@@ -175,8 +195,8 @@ void PostProcessingChainConfigWidget::onShaderConfigButtonClicked()
   std::optional<u32> index = getSelectedIndex();
   if (index.has_value() && index.value() < m_chain.GetStageCount())
   {
-    PostProcessingShaderConfigWidget shader_config(this, &m_chain.GetShaderStage(index.value()));
-    connect(&shader_config, &PostProcessingShaderConfigWidget::configChanged, [this]() { configChanged(); });
+    PostProcessingShaderConfigDialog shader_config(this, &m_chain.GetShaderStage(index.value()));
+    connect(&shader_config, &PostProcessingShaderConfigDialog::configChanged, [this]() { configChanged(); });
     shader_config.exec();
   }
 }
@@ -185,3 +205,10 @@ void PostProcessingChainConfigWidget::onReloadButtonClicked()
 {
   QtHostInterface::GetInstance()->reloadPostProcessingShaders();
 }
+
+void PostProcessingChainConfigWidget::onSelectedShaderChanged()
+{
+  std::optional<u32> index = getSelectedIndex();
+  selectedShaderChanged(index.has_value() ? static_cast<s32>(index.value()) : -1);
+  updateButtonStates(index);
+}
diff --git a/src/duckstation-qt/postprocessingchainconfigwidget.h b/src/duckstation-qt/postprocessingchainconfigwidget.h
index 99f787dbc..8645a4c02 100644
--- a/src/duckstation-qt/postprocessingchainconfigwidget.h
+++ b/src/duckstation-qt/postprocessingchainconfigwidget.h
@@ -19,9 +19,14 @@ public:
   PostProcessingChainConfigWidget(QWidget* parent);
   ~PostProcessingChainConfigWidget();
 
+  ALWAYS_INLINE FrontendCommon::PostProcessingChain& getChain() { return m_chain; }
+
   bool setConfigString(const std::string_view& config_string);
+  void setOptionsButtonVisible(bool visible);
 
 Q_SIGNALS:
+  void selectedShaderChanged(qint32 index);
+  void chainAboutToChange();
   void chainConfigStringChanged(const std::string& new_config_string);
 
 private Q_SLOTS:
@@ -32,13 +37,14 @@ private Q_SLOTS:
   void onMoveDownButtonClicked();
   void onShaderConfigButtonClicked();
   void onReloadButtonClicked();
-  void updateButtonStates();
+  void onSelectedShaderChanged();
 
 private:
   void connectUi();
   std::optional<u32> getSelectedIndex() const;
   void updateList();
   void configChanged();
+  void updateButtonStates(std::optional<u32> index);
 
   Ui::PostProcessingChainConfigWidget m_ui;
 
diff --git a/src/duckstation-qt/postprocessingchainconfigwidget.ui b/src/duckstation-qt/postprocessingchainconfigwidget.ui
index 82b38784a..1bfafebaa 100644
--- a/src/duckstation-qt/postprocessingchainconfigwidget.ui
+++ b/src/duckstation-qt/postprocessingchainconfigwidget.ui
@@ -6,18 +6,46 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>497</width>
-    <height>151</height>
+    <width>721</width>
+    <height>194</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QListWidget" name="shaders">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>80</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QToolButton" name="add">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Add</string>
        </property>
@@ -25,10 +53,19 @@
         <iconset resource="resources/resources.qrc">
          <normaloff>:/icons/list-add.png</normaloff>:/icons/list-add.png</iconset>
        </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="remove">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Remove</string>
        </property>
@@ -36,10 +73,19 @@
         <iconset resource="resources/resources.qrc">
          <normaloff>:/icons/list-remove.png</normaloff>:/icons/list-remove.png</iconset>
        </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="clear">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Clear</string>
        </property>
@@ -47,10 +93,19 @@
         <iconset resource="resources/resources.qrc">
          <normaloff>:/icons/edit-clear-16.png</normaloff>:/icons/edit-clear-16.png</iconset>
        </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="moveUp">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Move Up</string>
        </property>
@@ -58,10 +113,19 @@
         <iconset resource="resources/resources.qrc">
          <normaloff>:/icons/go-up-16.png</normaloff>:/icons/go-up-16.png</iconset>
        </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="moveDown">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
         <string>Move Down</string>
        </property>
@@ -69,69 +133,33 @@
         <iconset resource="resources/resources.qrc">
          <normaloff>:/icons/go-down-16.png</normaloff>:/icons/go-down-16.png</iconset>
        </property>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
+       </property>
       </widget>
      </item>
      <item>
       <widget class="QToolButton" name="shaderSettings">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
-        <string>Shader Settings...</string>
+        <string>Options...</string>
        </property>
        <property name="icon">
         <iconset resource="resources/resources.qrc">
-         <normaloff>:/icons/preferences-system@2x.png</normaloff>:/icons/preferences-system@2x.png</iconset>
+         <normaloff>:/icons/preferences-system.png</normaloff>:/icons/preferences-system.png</iconset>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="reload">
-       <property name="text">
-        <string>&amp;Reload Shaders</string>
-       </property>
-       <property name="icon">
-        <iconset resource="resources/icons.qrc">
-         <normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="loadPreset">
-       <property name="text">
-        <string>Load Preset</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="savePreset">
-       <property name="text">
-        <string>Save Preset</string>
+       <property name="toolButtonStyle">
+        <enum>Qt::ToolButtonTextBesideIcon</enum>
        </property>
       </widget>
      </item>
     </layout>
    </item>
-   <item row="0" column="0">
-    <widget class="QListWidget" name="shaders">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>50</height>
-      </size>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources>
diff --git a/src/duckstation-qt/postprocessingsettingswidget.cpp b/src/duckstation-qt/postprocessingsettingswidget.cpp
new file mode 100644
index 000000000..d86e51fc1
--- /dev/null
+++ b/src/duckstation-qt/postprocessingsettingswidget.cpp
@@ -0,0 +1,103 @@
+#include "postprocessingsettingswidget.h"
+#include "qthostinterface.h"
+#include "settingwidgetbinder.h"
+#include <QtWidgets/QMessageBox>
+
+PostProcessingSettingsWidget::PostProcessingSettingsWidget(QtHostInterface* host_interface, QWidget* parent,
+                                                           SettingsDialog* settings_dialog)
+  : QWidget(parent), m_host_interface(host_interface)
+{
+  m_ui.setupUi(this);
+  m_ui.widget->setOptionsButtonVisible(false);
+  m_ui.reload->setEnabled(false);
+  m_ui.loadPreset->setEnabled(false);
+  m_ui.savePreset->setEnabled(false);
+  updateShaderConfigPanel(-1);
+  connectUi();
+
+  SettingWidgetBinder::BindWidgetToBoolSetting(host_interface, m_ui.enablePostProcessing, "Display", "PostProcessing",
+                                               false);
+
+  std::string post_chain = m_host_interface->GetStringSettingValue("Display", "PostProcessChain");
+  if (!post_chain.empty())
+  {
+    if (!m_ui.widget->setConfigString(post_chain))
+    {
+      QMessageBox::critical(this, tr("Error"),
+                            tr("The current post-processing chain is invalid, it has been reset. Any changes made will "
+                               "overwrite the existing config."));
+    }
+    else
+    {
+      m_ui.reload->setEnabled(true);
+    }
+  }
+}
+
+PostProcessingSettingsWidget::~PostProcessingSettingsWidget() = default;
+
+void PostProcessingSettingsWidget::connectUi()
+{
+  connect(m_ui.reload, &QPushButton::clicked, this, &PostProcessingSettingsWidget::onReloadClicked);
+  connect(m_ui.widget, &PostProcessingChainConfigWidget::chainAboutToChange, this,
+          &PostProcessingSettingsWidget::onChainAboutToChange);
+  connect(m_ui.widget, &PostProcessingChainConfigWidget::selectedShaderChanged, this,
+          &PostProcessingSettingsWidget::onChainSelectedShaderChanged);
+  connect(m_ui.widget, &PostProcessingChainConfigWidget::chainConfigStringChanged, this,
+          &PostProcessingSettingsWidget::onConfigChanged);
+}
+
+void PostProcessingSettingsWidget::onChainAboutToChange()
+{
+  updateShaderConfigPanel(-1);
+}
+
+void PostProcessingSettingsWidget::onChainSelectedShaderChanged(qint32 index)
+{
+  updateShaderConfigPanel(index);
+}
+
+void PostProcessingSettingsWidget::updateShaderConfigPanel(s32 index)
+{
+  if (m_shader_config)
+  {
+    m_ui.scrollArea->setWidget(nullptr);
+    m_ui.scrollArea->setVisible(false);
+    delete m_shader_config;
+    m_shader_config = nullptr;
+  }
+
+  if (index < 0)
+    return;
+
+  FrontendCommon::PostProcessingShader& shader = m_ui.widget->getChain().GetShaderStage(static_cast<u32>(index));
+  if (!shader.HasOptions())
+    return;
+
+  m_shader_config = new PostProcessingShaderConfigWidget(m_ui.scrollArea, &shader);
+  connect(m_shader_config, &PostProcessingShaderConfigWidget::configChanged,
+          [this]() { onConfigChanged(m_ui.widget->getChain().GetConfigString()); });
+  m_ui.scrollArea->setWidget(m_shader_config);
+  m_ui.scrollArea->setVisible(true);
+}
+
+void PostProcessingSettingsWidget::onConfigChanged(const std::string& new_config)
+{
+  if (new_config.empty())
+  {
+    m_host_interface->RemoveSettingValue("Display", "PostProcessChain");
+    m_ui.reload->setEnabled(false);
+  }
+  else
+  {
+    m_host_interface->SetStringSettingValue("Display", "PostProcessChain", new_config.c_str());
+    m_ui.reload->setEnabled(true);
+  }
+
+  m_host_interface->applySettings();
+}
+
+void PostProcessingSettingsWidget::onReloadClicked()
+{
+  m_host_interface->reloadPostProcessingShaders();
+}
diff --git a/src/duckstation-qt/postprocessingsettingswidget.h b/src/duckstation-qt/postprocessingsettingswidget.h
new file mode 100644
index 000000000..5e4f5cbdf
--- /dev/null
+++ b/src/duckstation-qt/postprocessingsettingswidget.h
@@ -0,0 +1,33 @@
+#pragma once
+#include "postprocessingchainconfigwidget.h"
+#include "postprocessingshaderconfigwidget.h"
+#include "ui_postprocessingsettingswidget.h"
+#include <QtWidgets/QWidget>
+
+class QtHostInterface;
+class SettingsDialog;
+
+class PostProcessingSettingsWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  PostProcessingSettingsWidget(QtHostInterface* host_interface, QWidget* parent, SettingsDialog* settings_dialog);
+  ~PostProcessingSettingsWidget();
+
+private Q_SLOTS:
+  void onChainAboutToChange();
+  void onChainSelectedShaderChanged(qint32 index);
+  void onConfigChanged(const std::string& new_config);
+  void onReloadClicked();
+
+private:
+  void connectUi();
+  void updateShaderConfigPanel(s32 index);
+
+  QtHostInterface* m_host_interface;
+
+  Ui::PostProcessingSettingsWidget m_ui;
+
+  PostProcessingShaderConfigWidget* m_shader_config = nullptr;
+};
diff --git a/src/duckstation-qt/postprocessingsettingswidget.ui b/src/duckstation-qt/postprocessingsettingswidget.ui
new file mode 100644
index 000000000..4eee78615
--- /dev/null
+++ b/src/duckstation-qt/postprocessingsettingswidget.ui
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PostProcessingSettingsWidget</class>
+ <widget class="QWidget" name="PostProcessingSettingsWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>683</width>
+    <height>514</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QCheckBox" name="enablePostProcessing">
+       <property name="text">
+        <string>Enable Post Processing</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QPushButton" name="reload">
+       <property name="text">
+        <string>&amp;Reload Shaders</string>
+       </property>
+       <property name="icon">
+        <iconset resource="resources/resources.qrc">
+         <normaloff>:/icons/view-refresh.png</normaloff>:/icons/view-refresh.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="loadPreset">
+       <property name="text">
+        <string>Load Preset</string>
+       </property>
+       <property name="icon">
+        <iconset resource="resources/resources.qrc">
+         <normaloff>:/icons/document-save.png</normaloff>:/icons/document-save.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="savePreset">
+       <property name="text">
+        <string>Save Preset</string>
+       </property>
+       <property name="icon">
+        <iconset resource="resources/resources.qrc">
+         <normaloff>:/icons/document-open.png</normaloff>:/icons/document-open.png</iconset>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_2">
+     <property name="title">
+      <string>Post Processing Chain</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="PostProcessingChainConfigWidget" name="widget" native="true"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>1</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>681</width>
+        <height>390</height>
+       </rect>
+      </property>
+     </widget>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>40</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>PostProcessingChainConfigWidget</class>
+   <extends>QWidget</extends>
+   <header>duckstation-qt/postprocessingchainconfigwidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources>
+  <include location="resources/resources.qrc"/>
+ </resources>
+ <connections/>
+</ui>
diff --git a/src/duckstation-qt/postprocessingshaderconfigwidget.cpp b/src/duckstation-qt/postprocessingshaderconfigwidget.cpp
index b899bf88f..872ed6cf3 100644
--- a/src/duckstation-qt/postprocessingshaderconfigwidget.cpp
+++ b/src/duckstation-qt/postprocessingshaderconfigwidget.cpp
@@ -9,10 +9,8 @@ using FrontendCommon::PostProcessingShader;
 
 PostProcessingShaderConfigWidget::PostProcessingShaderConfigWidget(QWidget* parent,
                                                                    FrontendCommon::PostProcessingShader* shader)
-  : QDialog(parent), m_shader(shader)
+  : QWidget(parent), m_shader(shader)
 {
-  setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
-  setWindowTitle(tr("%1 Shader Options").arg(QString::fromStdString(m_shader->GetName())));
   createUi();
 }
 
@@ -20,7 +18,8 @@ PostProcessingShaderConfigWidget::~PostProcessingShaderConfigWidget() = default;
 
 void PostProcessingShaderConfigWidget::createUi()
 {
-  QGridLayout* layout = new QGridLayout(this);
+  m_layout = new QGridLayout(this);
+  m_layout->setContentsMargins(0, 0, 0, 0);
   u32 row = 0;
 
   for (PostProcessingShader::Option& option : m_shader->GetOptions())
@@ -38,7 +37,7 @@ void PostProcessingShaderConfigWidget::createUi()
         checkbox->setChecked(option.default_value[0].bool_value);
         option.value = option.default_value;
       });
-      layout->addWidget(checkbox, row, 0, 1, 3, Qt::AlignLeft);
+      m_layout->addWidget(checkbox, row, 0, 1, 3, Qt::AlignLeft);
       row++;
     }
     else
@@ -57,13 +56,13 @@ void PostProcessingShaderConfigWidget::createUi()
           label = tr("%1 (%2)").arg(QString::fromStdString(option.ui_name)).arg(tr(suffixes[i]));
         }
 
-        layout->addWidget(new QLabel(label, this), row, 0, 1, 1, Qt::AlignLeft);
+        m_layout->addWidget(new QLabel(label, this), row, 0, 1, 1, Qt::AlignLeft);
 
         QSlider* slider = new QSlider(Qt::Horizontal, this);
-        layout->addWidget(slider, row, 1, 1, 1, Qt::AlignLeft);
+        m_layout->addWidget(slider, row, 1, 1, 1, Qt::AlignLeft);
 
         QLabel* slider_label = new QLabel(this);
-        layout->addWidget(slider_label, row, 2, 1, 1, Qt::AlignLeft);
+        m_layout->addWidget(slider_label, row, 2, 1, 1, Qt::AlignLeft);
 
         if (option.type == PostProcessingShader::Option::Type::Int)
         {
@@ -132,16 +131,7 @@ void PostProcessingShaderConfigWidget::createUi()
 
   QPushButton* reset_button = new QPushButton(tr("Reset to Defaults"), this);
   connect(reset_button, &QPushButton::clicked, this, &PostProcessingShaderConfigWidget::onResetToDefaultsClicked);
-  layout->addWidget(reset_button, row, 0, 1, 2);
-
-  QPushButton* close_button = new QPushButton(tr("Close"), this);
-  connect(close_button, &QPushButton::clicked, this, &PostProcessingShaderConfigWidget::onCloseClicked);
-  layout->addWidget(close_button, row, 2, 1, 2);
-}
-
-void PostProcessingShaderConfigWidget::onCloseClicked()
-{
-  done(0);
+  m_layout->addWidget(reset_button, row, 0, 1, 1);
 }
 
 void PostProcessingShaderConfigWidget::onResetToDefaultsClicked()
@@ -149,3 +139,34 @@ void PostProcessingShaderConfigWidget::onResetToDefaultsClicked()
   resettingtoDefaults();
   configChanged();
 }
+
+PostProcessingShaderConfigDialog::PostProcessingShaderConfigDialog(QWidget* parent,
+                                                                   FrontendCommon::PostProcessingShader* shader)
+  : QDialog(parent)
+{
+  setWindowTitle(tr("%1 Shader Options").arg(QString::fromStdString(shader->GetName())));
+  setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+
+  QGridLayout* layout = new QGridLayout(this);
+  m_widget = new PostProcessingShaderConfigWidget(this, shader);
+  layout->addWidget(m_widget);
+
+  connect(m_widget, &PostProcessingShaderConfigWidget::configChanged, this,
+          &PostProcessingShaderConfigDialog::onConfigChanged);
+
+  QPushButton* close_button = new QPushButton(tr("Close"), this);
+  connect(close_button, &QPushButton::clicked, this, &PostProcessingShaderConfigDialog::onCloseClicked);
+  m_widget->getLayout()->addWidget(close_button, m_widget->getLayout()->rowCount() - 1, 2, 1, 2);
+}
+
+PostProcessingShaderConfigDialog::~PostProcessingShaderConfigDialog() = default;
+
+void PostProcessingShaderConfigDialog::onConfigChanged()
+{
+  configChanged();
+}
+
+void PostProcessingShaderConfigDialog::onCloseClicked()
+{
+  done(0);
+}
diff --git a/src/duckstation-qt/postprocessingshaderconfigwidget.h b/src/duckstation-qt/postprocessingshaderconfigwidget.h
index 8453cec77..d253e7346 100644
--- a/src/duckstation-qt/postprocessingshaderconfigwidget.h
+++ b/src/duckstation-qt/postprocessingshaderconfigwidget.h
@@ -1,8 +1,11 @@
 #pragma once
 #include "frontend-common/postprocessing_shader.h"
 #include <QtWidgets/QDialog>
+#include <QtWidgets/QWidget>
 
-class PostProcessingShaderConfigWidget : public QDialog
+class QGridLayout;
+
+class PostProcessingShaderConfigWidget : public QWidget
 {
   Q_OBJECT
 
@@ -10,17 +13,38 @@ public:
   PostProcessingShaderConfigWidget(QWidget* parent, FrontendCommon::PostProcessingShader* shader);
   ~PostProcessingShaderConfigWidget();
 
+  QGridLayout* getLayout() { return m_layout; }
+
 Q_SIGNALS:
   void configChanged();
   void resettingtoDefaults();
 
 private Q_SLOTS:
-  void onCloseClicked();
   void onResetToDefaultsClicked();
 
-private:
+protected:
   void createUi();
 
   FrontendCommon::PostProcessingShader* m_shader;
+  QGridLayout* m_layout;
+};
+
+class PostProcessingShaderConfigDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  PostProcessingShaderConfigDialog(QWidget* parent, FrontendCommon::PostProcessingShader* shader);
+  ~PostProcessingShaderConfigDialog();
+
+Q_SIGNALS:
+  void configChanged();
+
+private Q_SLOTS:
+  void onConfigChanged();
+  void onCloseClicked();
+
+private:
+  PostProcessingShaderConfigWidget* m_widget;
 };
 
diff --git a/src/duckstation-qt/resources/icons/applications-graphics.png b/src/duckstation-qt/resources/icons/applications-graphics.png
new file mode 100644
index 0000000000000000000000000000000000000000..89db8e081486aaf3a96ed9d26ca4802404aa2e8c
GIT binary patch
literal 1808
zcmV+r2k-caP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP0000WV@Og>004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006
zVoOIv0RI600RN!9r;`8x00(qQO+^Rd1px~NCH4<w8~^|Y6iGxuR9M69S8Hq>)fN8k
zydV4UW9{9<!Nhi!Bn~nWEi?&HAf`a1G(3U=;$gL=2ndm?CW=9=P@Af+)M*tds#FxI
zKlqVA_`@TVKtM!DC?aui#LEh@T@vrsj@FJJv!0oqxpVL32fNl1leU4FUp>;%T+O}r
zeBV9iyP7iu-+?{$J*cK(?6*xa`Ny~Y9o2Kve1mV<0$DTl!*_qb_5sdu@5S@;O@O3F
z^%rl;YU}c2MKKfd7rsjZWb0bv;JQ}rc3YRtlf!f{^n+(EUZl(ia`PR#S1gZ?{Vl3j
zRt+ki@##QeB9fg)4t<cLb68$U;Hx+Nt|ewA4>!~qtqYo(%#aaG6@7R`hfYltM`;xO
zeek6nyXP$f2{ZAVo7P>wLen&48+8m7JcuzJW-PA8Qc?5pXM;}w*gbC=FlpgBO;JDq
zZ~<^WM{&};Y2e9K+WkW)EcZ(hyi$PN*|Uhk5KM3|Vt~sQh=7<E0$W!ZKTOzUZ+F{!
z`f~#d@srK#v8ZV!EYpHS2&Nqe@1OjD?;n~tdBqj~<QjG5&h=(~<kxlLxt}(RPd@%o
ze4TO5#eo9{&UbZnHD0j{JpKbct10A_t!vDtz7d8(>%+)ivkYMvf-#24$w@>}geZz2
zNfJ6cI~z}&IPnhvo4&OOpIB`+85()x(HpJip>c-ZyugC1T16B^kYyP{2!vsXAPC_5
zJ|-t8;W!S7#bS%Ubq0R68g;77-+u6Vvvu5KIF*Y~@Km%XGW`94X?f|QB*vW*UOqmC
zz;_|>01^*zT}ujfye3f{OTJw2-|u>QEeYM%?rib05&=0m9AWSRgQ}bP=FV-_*(u1i
zF&$&Y5T^#labeoWzsHOCd~_Q5@gi(Pk<v9rPk(>E_(ml#;>lerHf(DfYI%(Gjw<-%
ze1wEfMoY29zf?4hgb~NI7s3nJoV|`4z>X(WP16>9BMtmzZ_iWB&22Y6^ze^K`<hKC
zE`3m><8pxl+gy7|PL>rZpbS$kg<Fc|>@RvHSeC7F&ab*`0zEx{SQ(GSx8J<(miW1I
z=P*2+LrwZ>u4iv~e&4(POG1d4sY%k3w24eo!Qy%q>z60d*<OdW%j$8%k~(B+3@Dl|
z>AK!>St8uCXOFEJ@}Ya~x;NwdK2D!L4L|V4C>MXWTW{VEybev%lC8CZWHKo*#y}}W
zlN|%4I>OLG7}g*R(|{zCk97Uo%Oaqt<lv7s-nE2tj^5s0T$mU;9|pnp9lzK)+hCZc
zS+6Jxgb?7IBZ?x-%*>!vDnV7%*;sMgf}$wb{Lcjby0_<%)vIs1wYH{Kdgs_X7(JiQ
zm3(hYclWPORIk%CEmZ-cl%l`CACBXE`OPN;_4W18G!3#W!!V5I|4LxPh7C&>E^KUX
zNHzXxMf<h(n@8W|`TW^|h?ef??tbRnoYqQ`Y82(maJgI#LI}iSF$f_bgn;LH0071q
z5{X3Ok_0+BI_z{heW;_OW8=)s3=Y5gPuFpZ9;Lyj5Hq*$+_`J&>j+DdRI92g9LE7;
z47P29bN&^ll!8)<csy=h>J~_nBpoyiV`C<hK|CIZ=Xv&9N8dVj<n^QLw{PF&mPtz&
zcT<Frq^hd$eIK@M!?G-xrU}zDq3b#{O@pE+2*VJ`WYXyB>ar^t(8{hfG&KBHmgPIs
z=`@ZUIRZ(N;QKxbg~GqioH?@qfB?V&uquz*+S*Ld^Rj(?eQ;eDj4^P|!5Et}CWOHA
zJezZV4}b#-fOwg}eU#Fl2SI@2$B#qTbr3=jhG94|GI9#Qq6#1YS{?%c>Fn&>vw8F8
zWdLB?_H0&oxh3M9&uW2lj#MgTQA+nS#_~$}RBHkBOifLJQVPqmpzFF2LYyfUi_bca
z^LZs^*<}EgyG3MKPGz%MQUSZzE5Ox0F)?8TLC~ZCZ~*iHxB)<o>$=Q!UAO$6m1|w8
zcclbUxqJ!$xmYZ|yKmpVMnVVyK+2~jWo=a2Fi{>000@F041(aJ|J0UO16LEMJP823
zN<(Tjsj5AdtW`=!0fc1_uH=7#Tz2Ua1ggdRf19;008rZI&$TW06aWAKC3HntbYx+4
zWjbSWWnpw>05UK!I4v+WEif@uF)=zYHaaslD=;uRFfj7~ABg|}03~!qSaf7zbY(hi
yZ)9m^c>ppnF*q$SH7zhPR539+Fg7|fHY+eNIxsMTU8gkw0000<MNUMnLSTY*5;j=?

literal 0
HcmV?d00001

diff --git a/src/duckstation-qt/resources/icons/applications-graphics@2x.png b/src/duckstation-qt/resources/icons/applications-graphics@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b48ef78bb48e53f5c194609a9f41895937ef49e
GIT binary patch
literal 4093
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

literal 0
HcmV?d00001

diff --git a/src/duckstation-qt/resources/resources.qrc b/src/duckstation-qt/resources/resources.qrc
index 9e86a91e1..d45321cce 100644
--- a/src/duckstation-qt/resources/resources.qrc
+++ b/src/duckstation-qt/resources/resources.qrc
@@ -6,6 +6,8 @@
     <file>icons/antialias-icon@2x.png</file>
     <file>icons/applications-development.png</file>
     <file>icons/applications-development@2x.png</file>
+    <file>icons/applications-graphics.png</file>
+    <file>icons/applications-graphics@2x.png</file>
     <file>icons/applications-internet.png</file>
     <file>icons/applications-other.png</file>
     <file>icons/applications-other@2x.png</file>
diff --git a/src/duckstation-qt/settingsdialog.cpp b/src/duckstation-qt/settingsdialog.cpp
index a834bd624..c594738f4 100644
--- a/src/duckstation-qt/settingsdialog.cpp
+++ b/src/duckstation-qt/settingsdialog.cpp
@@ -9,6 +9,7 @@
 #include "generalsettingswidget.h"
 #include "hotkeysettingswidget.h"
 #include "memorycardsettingswidget.h"
+#include "postprocessingsettingswidget.h"
 #include "qthostinterface.h"
 #include <QtWidgets/QTextEdit>
 
@@ -30,6 +31,7 @@ SettingsDialog::SettingsDialog(QtHostInterface* host_interface, QWidget* parent
   m_memory_card_settings = new MemoryCardSettingsWidget(host_interface, m_ui.settingsContainer, this);
   m_display_settings = new DisplaySettingsWidget(host_interface, m_ui.settingsContainer, this);
   m_enhancement_settings = new EnhancementSettingsWidget(host_interface, m_ui.settingsContainer, this);
+  m_post_processing_settings = new PostProcessingSettingsWidget(host_interface, m_ui.settingsContainer, this);
   m_audio_settings = new AudioSettingsWidget(host_interface, m_ui.settingsContainer, this);
   m_advanced_settings = new AdvancedSettingsWidget(host_interface, m_ui.settingsContainer, this);
 
@@ -41,6 +43,7 @@ SettingsDialog::SettingsDialog(QtHostInterface* host_interface, QWidget* parent
   m_ui.settingsContainer->insertWidget(static_cast<int>(Category::MemoryCardSettings), m_memory_card_settings);
   m_ui.settingsContainer->insertWidget(static_cast<int>(Category::DisplaySettings), m_display_settings);
   m_ui.settingsContainer->insertWidget(static_cast<int>(Category::EnhancementSettings), m_enhancement_settings);
+  m_ui.settingsContainer->insertWidget(static_cast<int>(Category::PostProcessingSettings), m_post_processing_settings);
   m_ui.settingsContainer->insertWidget(static_cast<int>(Category::AudioSettings), m_audio_settings);
   m_ui.settingsContainer->insertWidget(static_cast<int>(Category::AdvancedSettings), m_advanced_settings);
 
@@ -88,6 +91,9 @@ void SettingsDialog::setCategoryHelpTexts()
   m_category_help_text[static_cast<int>(Category::EnhancementSettings)] =
     tr("<strong>Enhancement Settings</strong><hr>These options control enhancements which can improve visuals compared "
        "to the original console. Mouse over each option for additional information.");
+  m_category_help_text[static_cast<int>(Category::PostProcessingSettings)] =
+    tr("<strong>Post-Processing Settings</strong><hr>Post processing allows you to alter the appearance of the image "
+       "displayed on the screen with various filters. Shaders will be executed in sequence.");
   m_category_help_text[static_cast<int>(Category::AudioSettings)] =
     tr("<strong>Audio Settings</strong><hr>These options control the audio output of the console. Mouse over an option "
        "for additional information.");
diff --git a/src/duckstation-qt/settingsdialog.h b/src/duckstation-qt/settingsdialog.h
index ea855ccf3..e01d8b08f 100644
--- a/src/duckstation-qt/settingsdialog.h
+++ b/src/duckstation-qt/settingsdialog.h
@@ -15,6 +15,7 @@ class ControllerSettingsWidget;
 class MemoryCardSettingsWidget;
 class DisplaySettingsWidget;
 class EnhancementSettingsWidget;
+class PostProcessingSettingsWidget;
 class AudioSettingsWidget;
 class AdvancedSettingsWidget;
 
@@ -33,6 +34,7 @@ public:
     MemoryCardSettings,
     DisplaySettings,
     EnhancementSettings,
+    PostProcessingSettings,
     AudioSettings,
     AdvancedSettings,
     Count
@@ -51,6 +53,7 @@ public:
   EnhancementSettingsWidget* getEnhancementSettingsWidget() const { return m_enhancement_settings; }
   AudioSettingsWidget* getAudioSettingsWidget() const { return m_audio_settings; }
   AdvancedSettingsWidget* getAdvancedSettingsWidget() const { return m_advanced_settings; }
+  PostProcessingSettingsWidget* getPostProcessingSettingsWidget() { return m_post_processing_settings; }
 
   void registerWidgetHelp(QObject* object, QString title, QString recommended_value, QString text);
   bool eventFilter(QObject* object, QEvent* event) override;
@@ -76,6 +79,7 @@ private:
   MemoryCardSettingsWidget* m_memory_card_settings = nullptr;
   DisplaySettingsWidget* m_display_settings = nullptr;
   EnhancementSettingsWidget* m_enhancement_settings = nullptr;
+  PostProcessingSettingsWidget *m_post_processing_settings = nullptr;
   AudioSettingsWidget* m_audio_settings = nullptr;
   AdvancedSettingsWidget* m_advanced_settings = nullptr;
 
diff --git a/src/duckstation-qt/settingsdialog.ui b/src/duckstation-qt/settingsdialog.ui
index c29ee60de..7bb715045 100644
--- a/src/duckstation-qt/settingsdialog.ui
+++ b/src/duckstation-qt/settingsdialog.ui
@@ -130,6 +130,15 @@
           <normaloff>:/icons/antialias-icon.png</normaloff>:/icons/antialias-icon.png</iconset>
         </property>
        </item>
+       <item>
+        <property name="text">
+         <string>Post-Processing Settings</string>
+        </property>
+        <property name="icon">
+         <iconset resource="resources/resources.qrc">
+          <normaloff>:/icons/applications-graphics.png</normaloff>:/icons/applications-graphics.png</iconset>
+        </property>
+       </item>
        <item>
         <property name="text">
          <string>Audio Settings</string>
diff --git a/src/frontend-common/common_host_interface.cpp b/src/frontend-common/common_host_interface.cpp
index c4fccc3f0..a65f481df 100644
--- a/src/frontend-common/common_host_interface.cpp
+++ b/src/frontend-common/common_host_interface.cpp
@@ -687,7 +687,7 @@ void CommonHostInterface::OnSystemCreated()
 {
   HostInterface::OnSystemCreated();
 
-  if (!m_display->SetPostProcessingChain(g_settings.display_post_process_chain))
+  if (g_settings.display_post_processing && !m_display->SetPostProcessingChain(g_settings.display_post_process_chain))
     AddOSDMessage(TranslateStdString("OSDMessage", "Failed to load post processing shader chain."), 20.0f);
 }
 
@@ -1967,10 +1967,18 @@ void CommonHostInterface::CheckForSettingsChanges(const Settings& old_settings)
       UpdateSpeedLimiterState();
     }
 
-    if (g_settings.display_post_process_chain != old_settings.display_post_process_chain)
+    if (g_settings.display_post_processing != old_settings.display_post_processing ||
+        g_settings.display_post_process_chain != old_settings.display_post_process_chain)
     {
-      if (!m_display->SetPostProcessingChain(g_settings.display_post_process_chain))
-        AddOSDMessage(TranslateStdString("OSDMessage", "Failed to load post processing shader chain."), 20.0f);
+      if (g_settings.display_post_processing)
+      {
+        if (!m_display->SetPostProcessingChain(g_settings.display_post_process_chain))
+          AddOSDMessage(TranslateStdString("OSDMessage", "Failed to load post processing shader chain."), 20.0f);
+      }
+      else
+      {
+        m_display->SetPostProcessingChain({});
+      }
     }
   }
 
@@ -2273,7 +2281,7 @@ void CommonHostInterface::ApplyCheatCode(u32 index)
 
 void CommonHostInterface::ReloadPostProcessingShaders()
 {
-  if (!m_display)
+  if (!m_display || !g_settings.display_post_processing)
     return;
 
   if (!m_display->SetPostProcessingChain(g_settings.display_post_process_chain))