Allow setting of post processing filter in config shadps4-emu#2136

diegolix29 · Jan 14, 2025 · 2b89306 · 2b89306
1 parent ad7de20
commit 2b89306
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 2 deletions.
diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -70,6 +70,7 @@ static bool separateupdatefolder = false;
 static bool compatibilityData = false;
 static bool checkCompatibilityOnStartup = false;
 static std::string trophyKey;
+static std::string ppFilter;
 
 // Gui
 static bool load_game_size = true;
@@ -239,6 +240,10 @@ u32 vblankDiv() {
     return vblankDivider;
 }
 
+std::string getPostProcessingFilter() {
+    return ppFilter;
+}
+
 bool vkValidationEnabled() {
     return vkValidation;
 }
@@ -327,6 +332,9 @@ void setVblankDiv(u32 value) {
     vblankDivider = value;
 }
 
+void setPostProcessingFilter(const std::string& type) {
+    ppFilter = type;
+}
 void setIsFullscreen(bool enable) {
     isFullscreen = enable;
 }
@@ -636,6 +644,7 @@ void load(const std::filesystem::path& path) {
 
         screenWidth = toml::find_or<int>(gpu, "screenWidth", screenWidth);
         screenHeight = toml::find_or<int>(gpu, "screenHeight", screenHeight);
+        ppFilter = toml::find_or<std::string>(gpu, "ppFilter", "linear");
         isNullGpu = toml::find_or<bool>(gpu, "nullGpu", false);
         shouldCopyGPUBuffers = toml::find_or<bool>(gpu, "copyGPUBuffers", false);
         shouldDumpShaders = toml::find_or<bool>(gpu, "dumpShaders", false);
@@ -749,6 +758,7 @@ void save(const std::filesystem::path& path) {
     data["Input"]["isMotionControlsEnabled"] = isMotionControlsEnabled;
     data["GPU"]["screenWidth"] = screenWidth;
     data["GPU"]["screenHeight"] = screenHeight;
+    data["GPU"]["ppFilter"] = ppFilter;
     data["GPU"]["nullGpu"] = isNullGpu;
     data["GPU"]["copyGPUBuffers"] = shouldCopyGPUBuffers;
     data["GPU"]["dumpShaders"] = shouldDumpShaders;

diff --git a/src/common/config.h b/src/common/config.h
@@ -45,6 +45,7 @@ bool getIsMotionControlsEnabled();
 u32 getScreenWidth();
 u32 getScreenHeight();
 s32 getGpuId();
+std::string getPostProcessingFilter();
 
 bool debugDump();
 bool collectShadersForDebug();
@@ -65,6 +66,7 @@ void setNullGpu(bool enable);
 void setCopyGPUCmdBuffers(bool enable);
 void setDumpShaders(bool enable);
 void setVblankDiv(u32 value);
+void setPostProcessingFilter(const std::string& type);
 void setGpuId(s32 selectedGpuId);
 void setScreenWidth(u32 width);
 void setScreenHeight(u32 height);

diff --git a/src/qt_gui/settings_dialog.cpp b/src/qt_gui/settings_dialog.cpp
@@ -91,6 +91,9 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices,
     ui->backButtonBehaviorComboBox->addItem(tr("Touchpad Right"), "right");
     ui->backButtonBehaviorComboBox->addItem(tr("None"), "none");
 
+    ui->ppFilterComboBox->addItem(tr("Linear"), "linear");
+    ui->ppFilterComboBox->addItem(tr("Nearest"), "nearest");
+
     InitializeEmulatorLanguages();
     LoadValuesFromConfig();
 
@@ -302,6 +305,11 @@ void SettingsDialog::LoadValuesFromConfig() {
     ui->widthSpinBox->setValue(toml::find_or<int>(data, "GPU", "screenWidth", 1280));
     ui->heightSpinBox->setValue(toml::find_or<int>(data, "GPU", "screenHeight", 720));
     ui->vblankSpinBox->setValue(toml::find_or<int>(data, "GPU", "vblankDivider", 1));
+    if (const auto i = ui->ppFilterComboBox->findData(
+            QString::fromStdString(toml::find_or<std::string>(data, "GPU", "ppFilter", "linear")));
+        i != -1) {
+        ui->ppFilterComboBox->setCurrentIndex(i);
+    }
     ui->dumpShadersCheckBox->setChecked(toml::find_or<bool>(data, "GPU", "dumpShaders", false));
     ui->nullGpuCheckBox->setChecked(toml::find_or<bool>(data, "GPU", "nullGpu", false));
     ui->playBGMCheckBox->setChecked(toml::find_or<bool>(data, "General", "playBGM", false));
@@ -568,6 +576,7 @@ void SettingsDialog::UpdateSettings() {
     Config::setScreenWidth(ui->widthSpinBox->value());
     Config::setScreenHeight(ui->heightSpinBox->value());
     Config::setVblankDiv(ui->vblankSpinBox->value());
+    Config::setPostProcessingFilter(ui->ppFilterComboBox->currentData().toString().toStdString());
     Config::setDumpShaders(ui->dumpShadersCheckBox->isChecked());
     Config::setNullGpu(ui->nullGpuCheckBox->isChecked());
     Config::setSeparateUpdateEnabled(ui->separateUpdatesCheckBox->isChecked());

diff --git a/src/qt_gui/settings_dialog.ui b/src/qt_gui/settings_dialog.ui
@@ -983,6 +983,18 @@
                <property name="bottomMargin">
                 <number>0</number>
                </property>
+               <item>
+                <widget class="QGroupBox" name="ppFilterGroupBox">
+                 <property name="title">
+                  <string>Post-Processing Filter</string>
+                 </property>
+                 <layout class="QVBoxLayout" name="verticalLayout_2">
+                  <item>
+                   <widget class="QComboBox" name="ppFilterComboBox"/>
+                  </item>
+                 </layout>
+                </widget>
+               </item>			   
               </layout>
              </widget>
             </item>

diff --git a/src/video_core/renderer_vulkan/vk_presenter.cpp b/src/video_core/renderer_vulkan/vk_presenter.cpp
@@ -286,9 +286,19 @@ void Presenter::CreatePostProcessPipeline() {
     instance.GetDevice().destroyShaderModule(fs_module);
 
     // Create sampler resource
+    const auto filters = std::unordered_map<std::string, vk::Filter>{
+        {"linear", vk::Filter::eLinear},
+        {"nearest", vk::Filter::eNearest},
+    };
+    auto pp_filter = vk::Filter::eLinear;
+    if (const auto filter = Config::getPostProcessingFilter(); filters.contains(filter)) {
+        pp_filter = filters.at(filter);
+    } else {
+        LOG_WARNING(Render_Vulkan, "Unknown post processing filter: {}", filter);
+    }
     const vk::SamplerCreateInfo sampler_ci = {
-        .magFilter = vk::Filter::eLinear,
-        .minFilter = vk::Filter::eLinear,
+        .magFilter = pp_filter,
+        .minFilter = pp_filter,
         .mipmapMode = vk::SamplerMipmapMode::eNearest,
         .addressModeU = vk::SamplerAddressMode::eClampToEdge,
         .addressModeV = vk::SamplerAddressMode::eClampToEdge,