VERY experimental Nintendo Switch 2 emulator
C++
FSR Sharpening Slider part 1 - only a global slider
Matías Locatti8e19421f8453
diff --git a/src/common/settings.cpp b/src/common/settings.cppindex 8173462cb3..926268ffcc 100644--- a/src/common/settings.cpp+++ b/src/common/settings.cpp@@ -48,6 +48,7 @@ void LogSettings() {log_setting("CPU_Accuracy", values.cpu_accuracy.GetValue());log_setting("Renderer_UseResolutionScaling", values.resolution_setup.GetValue());log_setting("Renderer_ScalingFilter", values.scaling_filter.GetValue());+ log_setting("Renderer_FSRSlider", values.fsr_sharpening_slider.GetValue());log_setting("Renderer_AntiAliasing", values.anti_aliasing.GetValue());log_setting("Renderer_UseSpeedLimit", values.use_speed_limit.GetValue());log_setting("Renderer_SpeedLimit", values.speed_limit.GetValue());diff --git a/src/common/settings.h b/src/common/settings.hindex 0eb98939c1..31d1955480 100644--- a/src/common/settings.h+++ b/src/common/settings.h@@ -421,6 +421,7 @@ struct Values {ResolutionScalingInfo resolution_info{};SwitchableSetting<ResolutionSetup> resolution_setup{ResolutionSetup::Res1X, "resolution_setup"};SwitchableSetting<ScalingFilter> scaling_filter{ScalingFilter::Bilinear, "scaling_filter"};+ SwitchableSetting<int, true> fsr_sharpening_slider{25, 0, 200, "fsr_sharpening_slider"};SwitchableSetting<AntiAliasing> anti_aliasing{AntiAliasing::None, "anti_aliasing"};// *nix platforms may have issues with the borderless windowed fullscreen mode.// Default to exclusive fullscreen on these platforms for now.diff --git a/src/video_core/renderer_vulkan/vk_fsr.cpp b/src/video_core/renderer_vulkan/vk_fsr.cppindex dd450169ef..33daa8c1ce 100644--- a/src/video_core/renderer_vulkan/vk_fsr.cpp+++ b/src/video_core/renderer_vulkan/vk_fsr.cpp@@ -5,6 +5,7 @@#include "common/bit_cast.h"#include "common/common_types.h"#include "common/div_ceil.h"+#include "common/settings.h"#include "video_core/host_shaders/vulkan_fidelityfx_fsr_easu_fp16_comp_spv.h"#include "video_core/host_shaders/vulkan_fidelityfx_fsr_easu_fp32_comp_spv.h"@@ -227,7 +228,10 @@ VkImageView FSR::Draw(Scheduler& scheduler, size_t image_index, VkImageView imagcmdbuf.BindPipeline(VK_PIPELINE_BIND_POINT_COMPUTE, *rcas_pipeline);- FsrRcasCon(push_constants.data(), 0.25f);+ const float sharpening =+ static_cast<float>(Settings::values.fsr_sharpening_slider.GetValue()) / 100.0f;++ FsrRcasCon(push_constants.data(), sharpening);cmdbuf.PushConstants(*pipeline_layout, VK_SHADER_STAGE_COMPUTE_BIT, push_constants);{diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cppindex 343f3b8e50..0c93df4281 100644--- a/src/yuzu/configuration/config.cpp+++ b/src/yuzu/configuration/config.cpp@@ -672,6 +672,7 @@ void Config::ReadRendererValues() {ReadGlobalSetting(Settings::values.aspect_ratio);ReadGlobalSetting(Settings::values.resolution_setup);ReadGlobalSetting(Settings::values.scaling_filter);+ ReadGlobalSetting(Settings::values.fsr_sharpening_slider);ReadGlobalSetting(Settings::values.anti_aliasing);ReadGlobalSetting(Settings::values.max_anisotropy);ReadGlobalSetting(Settings::values.use_speed_limit);@@ -1282,6 +1283,10 @@ void Config::SaveRendererValues() {static_cast<u32>(Settings::values.scaling_filter.GetValue(global)),static_cast<u32>(Settings::values.scaling_filter.GetDefault()),Settings::values.scaling_filter.UsingGlobal());+ WriteSetting(QString::fromStdString(Settings::values.fsr_sharpening_slider.GetLabel()),+ static_cast<u32>(Settings::values.fsr_sharpening_slider.GetValue(global)),+ static_cast<u32>(Settings::values.fsr_sharpening_slider.GetDefault()),+ Settings::values.fsr_sharpening_slider.UsingGlobal());WriteSetting(QString::fromStdString(Settings::values.anti_aliasing.GetLabel()),static_cast<u32>(Settings::values.anti_aliasing.GetValue(global)),static_cast<u32>(Settings::values.anti_aliasing.GetDefault()),diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cppindex bd69d04a65..3a40872ab2 100644--- a/src/yuzu/configuration/configure_graphics.cpp+++ b/src/yuzu/configuration/configure_graphics.cpp@@ -63,6 +63,9 @@ ConfigureGraphics::ConfigureGraphics(const Core::System& system_, QWidget* parenui->api_widget->isEnabled());ui->bg_label->setVisible(Settings::IsConfiguringGlobal());ui->bg_combobox->setVisible(!Settings::IsConfiguringGlobal());++ connect(ui->fsr_sharpening_slider, &QSlider::valueChanged, this,+ &ConfigureGraphics::SetFSRIndicatorText);}void ConfigureGraphics::UpdateDeviceSelection(int device) {@@ -110,6 +113,7 @@ void ConfigureGraphics::SetConfiguration() {static_cast<int>(Settings::values.resolution_setup.GetValue()));ui->scaling_filter_combobox->setCurrentIndex(static_cast<int>(Settings::values.scaling_filter.GetValue()));+ ui->fsr_sharpening_slider->setValue(Settings::values.fsr_sharpening_slider.GetValue());ui->anti_aliasing_combobox->setCurrentIndex(static_cast<int>(Settings::values.anti_aliasing.GetValue()));} else {@@ -155,6 +159,12 @@ void ConfigureGraphics::SetConfiguration() {Settings::values.bg_green.GetValue(),Settings::values.bg_blue.GetValue()));UpdateAPILayout();+ SetFSRIndicatorText(ui->fsr_sharpening_slider->sliderPosition());+}++void ConfigureGraphics::SetFSRIndicatorText(int percentage) {+ ui->fsr_sharpening_value->setText(+ tr("%1%", "FSR sharpening percentage (e.g. 50%)").arg(100 - (percentage / 2)));}void ConfigureGraphics::ApplyConfiguration() {@@ -210,6 +220,7 @@ void ConfigureGraphics::ApplyConfiguration() {if (Settings::values.anti_aliasing.UsingGlobal()) {Settings::values.anti_aliasing.SetValue(anti_aliasing);}+ Settings::values.fsr_sharpening_slider.SetValue(ui->fsr_sharpening_slider->value());} else {if (ui->resolution_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {Settings::values.resolution_setup.SetGlobal(true);@@ -380,6 +391,7 @@ void ConfigureGraphics::SetupPerGameUI() {ui->aspect_ratio_combobox->setEnabled(Settings::values.aspect_ratio.UsingGlobal());ui->resolution_combobox->setEnabled(Settings::values.resolution_setup.UsingGlobal());ui->scaling_filter_combobox->setEnabled(Settings::values.scaling_filter.UsingGlobal());+ ui->fsr_sharpening_slider->setEnabled(Settings::values.fsr_sharpening_slider.UsingGlobal());ui->anti_aliasing_combobox->setEnabled(Settings::values.anti_aliasing.UsingGlobal());ui->use_asynchronous_gpu_emulation->setEnabled(Settings::values.use_asynchronous_gpu_emulation.UsingGlobal());diff --git a/src/yuzu/configuration/configure_graphics.h b/src/yuzu/configuration/configure_graphics.hindex 70034eb1b1..d98d6624e2 100644--- a/src/yuzu/configuration/configure_graphics.h+++ b/src/yuzu/configuration/configure_graphics.h@@ -42,6 +42,8 @@ private:void RetrieveVulkanDevices();+ void SetFSRIndicatorText(int percentage);+void SetupPerGameUI();Settings::RendererBackend GetCurrentGraphicsBackend() const;diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.uiindex fdbb333725..de8b2f44e8 100644--- a/src/yuzu/configuration/configure_graphics.ui+++ b/src/yuzu/configuration/configure_graphics.ui@@ -152,6 +152,12 @@</item><item><widget class="QGroupBox" name="groupBox">+ <property name="maximumSize">+ <size>+ <width>16777215</width>+ <height>16777215</height>+ </size>+ </property><property name="title"><string>Graphics Settings</string></property>@@ -481,6 +487,105 @@</layout></widget></item>+ <item>+ <widget class="QWidget" name="fsr_sharpening_layout" native="true">+ <property name="enabled">+ <bool>true</bool>+ </property>+ <property name="sizePolicy">+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">+ <horstretch>0</horstretch>+ <verstretch>0</verstretch>+ </sizepolicy>+ </property>+ <layout class="QHBoxLayout" name="horizontalLayout">+ <property name="spacing">+ <number>6</number>+ </property>+ <property name="sizeConstraint">+ <enum>QLayout::SetDefaultConstraint</enum>+ </property>+ <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 alignment="Qt::AlignLeft">+ <widget class="QLabel" name="fsr_sharpening_label">+ <property name="sizePolicy">+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">+ <horstretch>0</horstretch>+ <verstretch>0</verstretch>+ </sizepolicy>+ </property>+ <property name="text">+ <string>FSR Sharpening:</string>+ </property>+ </widget>+ </item>+ <item>+ <widget class="QSlider" name="fsr_sharpening_slider">+ <property name="sizePolicy">+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">+ <horstretch>0</horstretch>+ <verstretch>0</verstretch>+ </sizepolicy>+ </property>+ <property name="baseSize">+ <size>+ <width>0</width>+ <height>0</height>+ </size>+ </property>+ <property name="maximum">+ <number>200</number>+ </property>+ <property name="sliderPosition">+ <number>25</number>+ </property>+ <property name="orientation">+ <enum>Qt::Horizontal</enum>+ </property>+ <property name="invertedAppearance">+ <bool>true</bool>+ </property>+ </widget>+ </item>+ <item>+ <widget class="QLabel" name="fsr_sharpening_value">+ <property name="sizePolicy">+ <sizepolicy hsizetype="Fixed" vsizetype="Preferred">+ <horstretch>0</horstretch>+ <verstretch>0</verstretch>+ </sizepolicy>+ </property>+ <property name="minimumSize">+ <size>+ <width>32</width>+ <height>0</height>+ </size>+ </property>+ <property name="text">+ <string>100%</string>+ </property>+ <property name="alignment">+ <set>Qt::AlignCenter</set>+ </property>+ </widget>+ </item>+ </layout>+ <zorder>fsr_sharpening_value</zorder>+ <zorder>fsr_sharpening_label</zorder>+ <zorder>fsr_sharpening_slider</zorder>+ </widget>+ </item><item><widget class="QWidget" name="bg_layout" native="true"><property name="sizePolicy">diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cppindex 66dd0dc154..d6bea9aa84 100644--- a/src/yuzu_cmd/config.cpp+++ b/src/yuzu_cmd/config.cpp@@ -299,6 +299,7 @@ void Config::ReadValues() {ReadSetting("Renderer", Settings::values.resolution_setup);ReadSetting("Renderer", Settings::values.scaling_filter);+ ReadSetting("Renderer", Settings::values.fsr_sharpening_slider);ReadSetting("Renderer", Settings::values.anti_aliasing);ReadSetting("Renderer", Settings::values.fullscreen_mode);ReadSetting("Renderer", Settings::values.aspect_ratio);