mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-11-27 02:14:15 +01:00
configure_graphics: Add GPU nvdec decoding as an option
Some system configurations may see visual regressions or lower performance using GPU decoding compared to CPU decoding. This setting provides the option for users to specify their decoding preference. Co-Authored-By: yzct12345 <87620833+yzct12345@users.noreply.github.com>
This commit is contained in:
parent
a832aa699f
commit
cd016d3cb5
@ -54,7 +54,7 @@ void LogSettings() {
|
|||||||
log_setting("Renderer_GPUAccuracyLevel", values.gpu_accuracy.GetValue());
|
log_setting("Renderer_GPUAccuracyLevel", values.gpu_accuracy.GetValue());
|
||||||
log_setting("Renderer_UseAsynchronousGpuEmulation",
|
log_setting("Renderer_UseAsynchronousGpuEmulation",
|
||||||
values.use_asynchronous_gpu_emulation.GetValue());
|
values.use_asynchronous_gpu_emulation.GetValue());
|
||||||
log_setting("Renderer_UseNvdecEmulation", values.use_nvdec_emulation.GetValue());
|
log_setting("Renderer_NvdecEmulation", values.nvdec_emulation.GetValue());
|
||||||
log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue());
|
log_setting("Renderer_AccelerateASTC", values.accelerate_astc.GetValue());
|
||||||
log_setting("Renderer_UseVsync", values.use_vsync.GetValue());
|
log_setting("Renderer_UseVsync", values.use_vsync.GetValue());
|
||||||
log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue());
|
log_setting("Renderer_ShaderBackend", values.shader_backend.GetValue());
|
||||||
@ -137,7 +137,7 @@ void RestoreGlobalState(bool is_powered_on) {
|
|||||||
values.use_disk_shader_cache.SetGlobal(true);
|
values.use_disk_shader_cache.SetGlobal(true);
|
||||||
values.gpu_accuracy.SetGlobal(true);
|
values.gpu_accuracy.SetGlobal(true);
|
||||||
values.use_asynchronous_gpu_emulation.SetGlobal(true);
|
values.use_asynchronous_gpu_emulation.SetGlobal(true);
|
||||||
values.use_nvdec_emulation.SetGlobal(true);
|
values.nvdec_emulation.SetGlobal(true);
|
||||||
values.accelerate_astc.SetGlobal(true);
|
values.accelerate_astc.SetGlobal(true);
|
||||||
values.use_vsync.SetGlobal(true);
|
values.use_vsync.SetGlobal(true);
|
||||||
values.shader_backend.SetGlobal(true);
|
values.shader_backend.SetGlobal(true);
|
||||||
|
@ -48,6 +48,12 @@ enum class FullscreenMode : u32 {
|
|||||||
Exclusive = 1,
|
Exclusive = 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum class NvdecEmulation : u32 {
|
||||||
|
Off = 0,
|
||||||
|
CPU = 1,
|
||||||
|
GPU = 2,
|
||||||
|
};
|
||||||
|
|
||||||
/** The BasicSetting class is a simple resource manager. It defines a label and default value
|
/** The BasicSetting class is a simple resource manager. It defines a label and default value
|
||||||
* alongside the actual value of the setting for simpler and less-error prone use with frontend
|
* alongside the actual value of the setting for simpler and less-error prone use with frontend
|
||||||
* configurations. Setting a default value and label is required, though subclasses may deviate from
|
* configurations. Setting a default value and label is required, though subclasses may deviate from
|
||||||
@ -466,7 +472,7 @@ struct Values {
|
|||||||
RangedSetting<GPUAccuracy> gpu_accuracy{GPUAccuracy::High, GPUAccuracy::Normal,
|
RangedSetting<GPUAccuracy> gpu_accuracy{GPUAccuracy::High, GPUAccuracy::Normal,
|
||||||
GPUAccuracy::Extreme, "gpu_accuracy"};
|
GPUAccuracy::Extreme, "gpu_accuracy"};
|
||||||
Setting<bool> use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"};
|
Setting<bool> use_asynchronous_gpu_emulation{true, "use_asynchronous_gpu_emulation"};
|
||||||
Setting<bool> use_nvdec_emulation{true, "use_nvdec_emulation"};
|
Setting<NvdecEmulation> nvdec_emulation{NvdecEmulation::GPU, "nvdec_emulation"};
|
||||||
Setting<bool> accelerate_astc{true, "accelerate_astc"};
|
Setting<bool> accelerate_astc{true, "accelerate_astc"};
|
||||||
Setting<bool> use_vsync{true, "use_vsync"};
|
Setting<bool> use_vsync{true, "use_vsync"};
|
||||||
BasicRangedSetting<u16> fps_cap{1000, 1, 1000, "fps_cap"};
|
BasicRangedSetting<u16> fps_cap{1000, 1, 1000, "fps_cap"};
|
||||||
|
@ -72,6 +72,18 @@ static const char* TranslateGPUAccuracyLevel(Settings::GPUAccuracy backend) {
|
|||||||
return "Unknown";
|
return "Unknown";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const char* TranslateNvdecEmulation(Settings::NvdecEmulation backend) {
|
||||||
|
switch (backend) {
|
||||||
|
case Settings::NvdecEmulation::Off:
|
||||||
|
return "Off";
|
||||||
|
case Settings::NvdecEmulation::CPU:
|
||||||
|
return "CPU";
|
||||||
|
case Settings::NvdecEmulation::GPU:
|
||||||
|
return "GPU";
|
||||||
|
}
|
||||||
|
return "Unknown";
|
||||||
|
}
|
||||||
|
|
||||||
u64 GetTelemetryId() {
|
u64 GetTelemetryId() {
|
||||||
u64 telemetry_id{};
|
u64 telemetry_id{};
|
||||||
const auto filename = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "telemetry_id";
|
const auto filename = Common::FS::GetYuzuPath(Common::FS::YuzuPath::ConfigDir) / "telemetry_id";
|
||||||
@ -229,8 +241,8 @@ void TelemetrySession::AddInitialInfo(Loader::AppLoader& app_loader,
|
|||||||
TranslateGPUAccuracyLevel(Settings::values.gpu_accuracy.GetValue()));
|
TranslateGPUAccuracyLevel(Settings::values.gpu_accuracy.GetValue()));
|
||||||
AddField(field_type, "Renderer_UseAsynchronousGpuEmulation",
|
AddField(field_type, "Renderer_UseAsynchronousGpuEmulation",
|
||||||
Settings::values.use_asynchronous_gpu_emulation.GetValue());
|
Settings::values.use_asynchronous_gpu_emulation.GetValue());
|
||||||
AddField(field_type, "Renderer_UseNvdecEmulation",
|
AddField(field_type, "Renderer_NvdecEmulation",
|
||||||
Settings::values.use_nvdec_emulation.GetValue());
|
TranslateNvdecEmulation(Settings::values.nvdec_emulation.GetValue()));
|
||||||
AddField(field_type, "Renderer_AccelerateASTC", Settings::values.accelerate_astc.GetValue());
|
AddField(field_type, "Renderer_AccelerateASTC", Settings::values.accelerate_astc.GetValue());
|
||||||
AddField(field_type, "Renderer_UseVsync", Settings::values.use_vsync.GetValue());
|
AddField(field_type, "Renderer_UseVsync", Settings::values.use_vsync.GetValue());
|
||||||
AddField(field_type, "Renderer_ShaderBackend",
|
AddField(field_type, "Renderer_ShaderBackend",
|
||||||
|
@ -5,6 +5,7 @@
|
|||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include "common/assert.h"
|
#include "common/assert.h"
|
||||||
|
#include "common/settings.h"
|
||||||
#include "video_core/command_classes/codecs/codec.h"
|
#include "video_core/command_classes/codecs/codec.h"
|
||||||
#include "video_core/command_classes/codecs/h264.h"
|
#include "video_core/command_classes/codecs/h264.h"
|
||||||
#include "video_core/command_classes/codecs/vp9.h"
|
#include "video_core/command_classes/codecs/vp9.h"
|
||||||
@ -142,8 +143,11 @@ void Codec::Initialize() {
|
|||||||
}
|
}
|
||||||
}();
|
}();
|
||||||
av_codec = avcodec_find_decoder(codec);
|
av_codec = avcodec_find_decoder(codec);
|
||||||
|
|
||||||
InitializeAvCodecContext();
|
InitializeAvCodecContext();
|
||||||
InitializeGpuDecoder();
|
if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::GPU) {
|
||||||
|
InitializeGpuDecoder();
|
||||||
|
}
|
||||||
if (const int res = avcodec_open2(av_codec_ctx, av_codec, nullptr); res < 0) {
|
if (const int res = avcodec_open2(av_codec_ctx, av_codec, nullptr); res < 0) {
|
||||||
LOG_ERROR(Service_NVDRV, "avcodec_open2() Failed with result {}", res);
|
LOG_ERROR(Service_NVDRV, "avcodec_open2() Failed with result {}", res);
|
||||||
avcodec_free_context(&av_codec_ctx);
|
avcodec_free_context(&av_codec_ctx);
|
||||||
|
@ -37,7 +37,8 @@ std::unique_ptr<VideoCore::RendererBase> CreateRenderer(
|
|||||||
namespace VideoCore {
|
namespace VideoCore {
|
||||||
|
|
||||||
std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Core::System& system) {
|
std::unique_ptr<Tegra::GPU> CreateGPU(Core::Frontend::EmuWindow& emu_window, Core::System& system) {
|
||||||
const bool use_nvdec = Settings::values.use_nvdec_emulation.GetValue();
|
const auto nvdec_value = Settings::values.nvdec_emulation.GetValue();
|
||||||
|
const bool use_nvdec = nvdec_value != Settings::NvdecEmulation::Off;
|
||||||
const bool use_async = Settings::values.use_asynchronous_gpu_emulation.GetValue();
|
const bool use_async = Settings::values.use_asynchronous_gpu_emulation.GetValue();
|
||||||
auto gpu = std::make_unique<Tegra::GPU>(system, use_async, use_nvdec);
|
auto gpu = std::make_unique<Tegra::GPU>(system, use_async, use_nvdec);
|
||||||
auto context = emu_window.CreateSharedContext();
|
auto context = emu_window.CreateSharedContext();
|
||||||
|
@ -811,7 +811,7 @@ void Config::ReadRendererValues() {
|
|||||||
ReadGlobalSetting(Settings::values.use_disk_shader_cache);
|
ReadGlobalSetting(Settings::values.use_disk_shader_cache);
|
||||||
ReadGlobalSetting(Settings::values.gpu_accuracy);
|
ReadGlobalSetting(Settings::values.gpu_accuracy);
|
||||||
ReadGlobalSetting(Settings::values.use_asynchronous_gpu_emulation);
|
ReadGlobalSetting(Settings::values.use_asynchronous_gpu_emulation);
|
||||||
ReadGlobalSetting(Settings::values.use_nvdec_emulation);
|
ReadGlobalSetting(Settings::values.nvdec_emulation);
|
||||||
ReadGlobalSetting(Settings::values.accelerate_astc);
|
ReadGlobalSetting(Settings::values.accelerate_astc);
|
||||||
ReadGlobalSetting(Settings::values.use_vsync);
|
ReadGlobalSetting(Settings::values.use_vsync);
|
||||||
ReadGlobalSetting(Settings::values.shader_backend);
|
ReadGlobalSetting(Settings::values.shader_backend);
|
||||||
@ -1348,7 +1348,10 @@ void Config::SaveRendererValues() {
|
|||||||
static_cast<u32>(Settings::values.gpu_accuracy.GetDefault()),
|
static_cast<u32>(Settings::values.gpu_accuracy.GetDefault()),
|
||||||
Settings::values.gpu_accuracy.UsingGlobal());
|
Settings::values.gpu_accuracy.UsingGlobal());
|
||||||
WriteGlobalSetting(Settings::values.use_asynchronous_gpu_emulation);
|
WriteGlobalSetting(Settings::values.use_asynchronous_gpu_emulation);
|
||||||
WriteGlobalSetting(Settings::values.use_nvdec_emulation);
|
WriteSetting(QString::fromStdString(Settings::values.nvdec_emulation.GetLabel()),
|
||||||
|
static_cast<u32>(Settings::values.nvdec_emulation.GetValue(global)),
|
||||||
|
static_cast<u32>(Settings::values.nvdec_emulation.GetDefault()),
|
||||||
|
Settings::values.nvdec_emulation.UsingGlobal());
|
||||||
WriteGlobalSetting(Settings::values.accelerate_astc);
|
WriteGlobalSetting(Settings::values.accelerate_astc);
|
||||||
WriteGlobalSetting(Settings::values.use_vsync);
|
WriteGlobalSetting(Settings::values.use_vsync);
|
||||||
WriteSetting(QString::fromStdString(Settings::values.shader_backend.GetLabel()),
|
WriteSetting(QString::fromStdString(Settings::values.shader_backend.GetLabel()),
|
||||||
|
@ -182,5 +182,6 @@ private:
|
|||||||
Q_DECLARE_METATYPE(Settings::CPUAccuracy);
|
Q_DECLARE_METATYPE(Settings::CPUAccuracy);
|
||||||
Q_DECLARE_METATYPE(Settings::GPUAccuracy);
|
Q_DECLARE_METATYPE(Settings::GPUAccuracy);
|
||||||
Q_DECLARE_METATYPE(Settings::FullscreenMode);
|
Q_DECLARE_METATYPE(Settings::FullscreenMode);
|
||||||
|
Q_DECLARE_METATYPE(Settings::NvdecEmulation);
|
||||||
Q_DECLARE_METATYPE(Settings::RendererBackend);
|
Q_DECLARE_METATYPE(Settings::RendererBackend);
|
||||||
Q_DECLARE_METATYPE(Settings::ShaderBackend);
|
Q_DECLARE_METATYPE(Settings::ShaderBackend);
|
||||||
|
@ -88,24 +88,30 @@ void ConfigureGraphics::SetConfiguration() {
|
|||||||
ui->api_widget->setEnabled(runtime_lock);
|
ui->api_widget->setEnabled(runtime_lock);
|
||||||
ui->use_asynchronous_gpu_emulation->setEnabled(runtime_lock);
|
ui->use_asynchronous_gpu_emulation->setEnabled(runtime_lock);
|
||||||
ui->use_disk_shader_cache->setEnabled(runtime_lock);
|
ui->use_disk_shader_cache->setEnabled(runtime_lock);
|
||||||
ui->use_nvdec_emulation->setEnabled(runtime_lock);
|
ui->nvdec_emulation_widget->setEnabled(runtime_lock);
|
||||||
ui->accelerate_astc->setEnabled(runtime_lock);
|
ui->accelerate_astc->setEnabled(runtime_lock);
|
||||||
ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue());
|
ui->use_disk_shader_cache->setChecked(Settings::values.use_disk_shader_cache.GetValue());
|
||||||
ui->use_asynchronous_gpu_emulation->setChecked(
|
ui->use_asynchronous_gpu_emulation->setChecked(
|
||||||
Settings::values.use_asynchronous_gpu_emulation.GetValue());
|
Settings::values.use_asynchronous_gpu_emulation.GetValue());
|
||||||
ui->use_nvdec_emulation->setChecked(Settings::values.use_nvdec_emulation.GetValue());
|
|
||||||
ui->accelerate_astc->setChecked(Settings::values.accelerate_astc.GetValue());
|
ui->accelerate_astc->setChecked(Settings::values.accelerate_astc.GetValue());
|
||||||
|
|
||||||
if (Settings::IsConfiguringGlobal()) {
|
if (Settings::IsConfiguringGlobal()) {
|
||||||
ui->api->setCurrentIndex(static_cast<int>(Settings::values.renderer_backend.GetValue()));
|
ui->api->setCurrentIndex(static_cast<int>(Settings::values.renderer_backend.GetValue()));
|
||||||
ui->fullscreen_mode_combobox->setCurrentIndex(
|
ui->fullscreen_mode_combobox->setCurrentIndex(
|
||||||
static_cast<int>(Settings::values.fullscreen_mode.GetValue()));
|
static_cast<int>(Settings::values.fullscreen_mode.GetValue()));
|
||||||
|
ui->nvdec_emulation->setCurrentIndex(
|
||||||
|
static_cast<int>(Settings::values.nvdec_emulation.GetValue()));
|
||||||
ui->aspect_ratio_combobox->setCurrentIndex(Settings::values.aspect_ratio.GetValue());
|
ui->aspect_ratio_combobox->setCurrentIndex(Settings::values.aspect_ratio.GetValue());
|
||||||
} else {
|
} else {
|
||||||
ConfigurationShared::SetPerGameSetting(ui->api, &Settings::values.renderer_backend);
|
ConfigurationShared::SetPerGameSetting(ui->api, &Settings::values.renderer_backend);
|
||||||
ConfigurationShared::SetHighlight(ui->api_widget,
|
ConfigurationShared::SetHighlight(ui->api_widget,
|
||||||
!Settings::values.renderer_backend.UsingGlobal());
|
!Settings::values.renderer_backend.UsingGlobal());
|
||||||
|
|
||||||
|
ConfigurationShared::SetPerGameSetting(ui->nvdec_emulation,
|
||||||
|
&Settings::values.nvdec_emulation);
|
||||||
|
ConfigurationShared::SetHighlight(ui->nvdec_emulation_widget,
|
||||||
|
!Settings::values.nvdec_emulation.UsingGlobal());
|
||||||
|
|
||||||
ConfigurationShared::SetPerGameSetting(ui->fullscreen_mode_combobox,
|
ConfigurationShared::SetPerGameSetting(ui->fullscreen_mode_combobox,
|
||||||
&Settings::values.fullscreen_mode);
|
&Settings::values.fullscreen_mode);
|
||||||
ConfigurationShared::SetHighlight(ui->fullscreen_mode_label,
|
ConfigurationShared::SetHighlight(ui->fullscreen_mode_label,
|
||||||
@ -137,8 +143,6 @@ void ConfigureGraphics::ApplyConfiguration() {
|
|||||||
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_gpu_emulation,
|
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_gpu_emulation,
|
||||||
ui->use_asynchronous_gpu_emulation,
|
ui->use_asynchronous_gpu_emulation,
|
||||||
use_asynchronous_gpu_emulation);
|
use_asynchronous_gpu_emulation);
|
||||||
ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_nvdec_emulation,
|
|
||||||
ui->use_nvdec_emulation, use_nvdec_emulation);
|
|
||||||
ConfigurationShared::ApplyPerGameSetting(&Settings::values.accelerate_astc, ui->accelerate_astc,
|
ConfigurationShared::ApplyPerGameSetting(&Settings::values.accelerate_astc, ui->accelerate_astc,
|
||||||
accelerate_astc);
|
accelerate_astc);
|
||||||
|
|
||||||
@ -147,6 +151,9 @@ void ConfigureGraphics::ApplyConfiguration() {
|
|||||||
if (Settings::values.renderer_backend.UsingGlobal()) {
|
if (Settings::values.renderer_backend.UsingGlobal()) {
|
||||||
Settings::values.renderer_backend.SetValue(GetCurrentGraphicsBackend());
|
Settings::values.renderer_backend.SetValue(GetCurrentGraphicsBackend());
|
||||||
}
|
}
|
||||||
|
if (Settings::values.nvdec_emulation.UsingGlobal()) {
|
||||||
|
Settings::values.nvdec_emulation.SetValue(GetCurrentNvdecEmulation());
|
||||||
|
}
|
||||||
if (Settings::values.shader_backend.UsingGlobal()) {
|
if (Settings::values.shader_backend.UsingGlobal()) {
|
||||||
Settings::values.shader_backend.SetValue(shader_backend);
|
Settings::values.shader_backend.SetValue(shader_backend);
|
||||||
}
|
}
|
||||||
@ -180,6 +187,13 @@ void ConfigureGraphics::ApplyConfiguration() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ui->nvdec_emulation->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
|
||||||
|
Settings::values.nvdec_emulation.SetGlobal(true);
|
||||||
|
} else {
|
||||||
|
Settings::values.nvdec_emulation.SetGlobal(false);
|
||||||
|
Settings::values.nvdec_emulation.SetValue(GetCurrentNvdecEmulation());
|
||||||
|
}
|
||||||
|
|
||||||
if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
|
if (ui->bg_combobox->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
|
||||||
Settings::values.bg_red.SetGlobal(true);
|
Settings::values.bg_red.SetGlobal(true);
|
||||||
Settings::values.bg_green.SetGlobal(true);
|
Settings::values.bg_green.SetGlobal(true);
|
||||||
@ -278,6 +292,20 @@ Settings::RendererBackend ConfigureGraphics::GetCurrentGraphicsBackend() const {
|
|||||||
ConfigurationShared::USE_GLOBAL_OFFSET);
|
ConfigurationShared::USE_GLOBAL_OFFSET);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Settings::NvdecEmulation ConfigureGraphics::GetCurrentNvdecEmulation() const {
|
||||||
|
if (Settings::IsConfiguringGlobal()) {
|
||||||
|
return static_cast<Settings::NvdecEmulation>(ui->nvdec_emulation->currentIndex());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ui->nvdec_emulation->currentIndex() == ConfigurationShared::USE_GLOBAL_INDEX) {
|
||||||
|
Settings::values.nvdec_emulation.SetGlobal(true);
|
||||||
|
return Settings::values.nvdec_emulation.GetValue();
|
||||||
|
}
|
||||||
|
Settings::values.nvdec_emulation.SetGlobal(false);
|
||||||
|
return static_cast<Settings::NvdecEmulation>(ui->nvdec_emulation->currentIndex() -
|
||||||
|
ConfigurationShared::USE_GLOBAL_OFFSET);
|
||||||
|
}
|
||||||
|
|
||||||
void ConfigureGraphics::SetupPerGameUI() {
|
void ConfigureGraphics::SetupPerGameUI() {
|
||||||
if (Settings::IsConfiguringGlobal()) {
|
if (Settings::IsConfiguringGlobal()) {
|
||||||
ui->api->setEnabled(Settings::values.renderer_backend.UsingGlobal());
|
ui->api->setEnabled(Settings::values.renderer_backend.UsingGlobal());
|
||||||
@ -286,7 +314,7 @@ void ConfigureGraphics::SetupPerGameUI() {
|
|||||||
ui->aspect_ratio_combobox->setEnabled(Settings::values.aspect_ratio.UsingGlobal());
|
ui->aspect_ratio_combobox->setEnabled(Settings::values.aspect_ratio.UsingGlobal());
|
||||||
ui->use_asynchronous_gpu_emulation->setEnabled(
|
ui->use_asynchronous_gpu_emulation->setEnabled(
|
||||||
Settings::values.use_asynchronous_gpu_emulation.UsingGlobal());
|
Settings::values.use_asynchronous_gpu_emulation.UsingGlobal());
|
||||||
ui->use_nvdec_emulation->setEnabled(Settings::values.use_nvdec_emulation.UsingGlobal());
|
ui->nvdec_emulation->setEnabled(Settings::values.nvdec_emulation.UsingGlobal());
|
||||||
ui->accelerate_astc->setEnabled(Settings::values.accelerate_astc.UsingGlobal());
|
ui->accelerate_astc->setEnabled(Settings::values.accelerate_astc.UsingGlobal());
|
||||||
ui->use_disk_shader_cache->setEnabled(Settings::values.use_disk_shader_cache.UsingGlobal());
|
ui->use_disk_shader_cache->setEnabled(Settings::values.use_disk_shader_cache.UsingGlobal());
|
||||||
ui->bg_button->setEnabled(Settings::values.bg_red.UsingGlobal());
|
ui->bg_button->setEnabled(Settings::values.bg_red.UsingGlobal());
|
||||||
@ -301,8 +329,6 @@ void ConfigureGraphics::SetupPerGameUI() {
|
|||||||
|
|
||||||
ConfigurationShared::SetColoredTristate(
|
ConfigurationShared::SetColoredTristate(
|
||||||
ui->use_disk_shader_cache, Settings::values.use_disk_shader_cache, use_disk_shader_cache);
|
ui->use_disk_shader_cache, Settings::values.use_disk_shader_cache, use_disk_shader_cache);
|
||||||
ConfigurationShared::SetColoredTristate(
|
|
||||||
ui->use_nvdec_emulation, Settings::values.use_nvdec_emulation, use_nvdec_emulation);
|
|
||||||
ConfigurationShared::SetColoredTristate(ui->accelerate_astc, Settings::values.accelerate_astc,
|
ConfigurationShared::SetColoredTristate(ui->accelerate_astc, Settings::values.accelerate_astc,
|
||||||
accelerate_astc);
|
accelerate_astc);
|
||||||
ConfigurationShared::SetColoredTristate(ui->use_asynchronous_gpu_emulation,
|
ConfigurationShared::SetColoredTristate(ui->use_asynchronous_gpu_emulation,
|
||||||
@ -316,4 +342,6 @@ void ConfigureGraphics::SetupPerGameUI() {
|
|||||||
static_cast<int>(Settings::values.fullscreen_mode.GetValue(true)));
|
static_cast<int>(Settings::values.fullscreen_mode.GetValue(true)));
|
||||||
ConfigurationShared::InsertGlobalItem(
|
ConfigurationShared::InsertGlobalItem(
|
||||||
ui->api, static_cast<int>(Settings::values.renderer_backend.GetValue(true)));
|
ui->api, static_cast<int>(Settings::values.renderer_backend.GetValue(true)));
|
||||||
|
ConfigurationShared::InsertGlobalItem(
|
||||||
|
ui->nvdec_emulation, static_cast<int>(Settings::values.nvdec_emulation.GetValue(true)));
|
||||||
}
|
}
|
||||||
|
@ -43,6 +43,7 @@ private:
|
|||||||
void SetupPerGameUI();
|
void SetupPerGameUI();
|
||||||
|
|
||||||
Settings::RendererBackend GetCurrentGraphicsBackend() const;
|
Settings::RendererBackend GetCurrentGraphicsBackend() const;
|
||||||
|
Settings::NvdecEmulation GetCurrentNvdecEmulation() const;
|
||||||
|
|
||||||
std::unique_ptr<Ui::ConfigureGraphics> ui;
|
std::unique_ptr<Ui::ConfigureGraphics> ui;
|
||||||
QColor bg_color;
|
QColor bg_color;
|
||||||
|
@ -167,13 +167,6 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="use_nvdec_emulation">
|
|
||||||
<property name="text">
|
|
||||||
<string>Use NVDEC emulation</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<widget class="QCheckBox" name="accelerate_astc">
|
<widget class="QCheckBox" name="accelerate_astc">
|
||||||
<property name="text">
|
<property name="text">
|
||||||
@ -181,6 +174,50 @@
|
|||||||
</property>
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QWidget" name="nvdec_emulation_widget" native="true">
|
||||||
|
<layout class="QHBoxLayout" name="nvdec_emulation_layout">
|
||||||
|
<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>
|
||||||
|
<widget class="QLabel" name="nvdec_emulation_label">
|
||||||
|
<property name="text">
|
||||||
|
<string>NVDEC emulation:</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="nvdec_emulation">
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>Disabled</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>CPU Decoding</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>GPU Decoding</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QWidget" name="fullscreen_mode_layout" native="true">
|
<widget class="QWidget" name="fullscreen_mode_layout" native="true">
|
||||||
<layout class="QHBoxLayout" name="horizontalLayout_1">
|
<layout class="QHBoxLayout" name="horizontalLayout_1">
|
||||||
|
@ -465,7 +465,7 @@ void Config::ReadValues() {
|
|||||||
ReadSetting("Renderer", Settings::values.disable_fps_limit);
|
ReadSetting("Renderer", Settings::values.disable_fps_limit);
|
||||||
ReadSetting("Renderer", Settings::values.shader_backend);
|
ReadSetting("Renderer", Settings::values.shader_backend);
|
||||||
ReadSetting("Renderer", Settings::values.use_asynchronous_shaders);
|
ReadSetting("Renderer", Settings::values.use_asynchronous_shaders);
|
||||||
ReadSetting("Renderer", Settings::values.use_nvdec_emulation);
|
ReadSetting("Renderer", Settings::values.nvdec_emulation);
|
||||||
ReadSetting("Renderer", Settings::values.accelerate_astc);
|
ReadSetting("Renderer", Settings::values.accelerate_astc);
|
||||||
ReadSetting("Renderer", Settings::values.use_fast_gpu_time);
|
ReadSetting("Renderer", Settings::values.use_fast_gpu_time);
|
||||||
ReadSetting("Renderer", Settings::values.use_caches_gc);
|
ReadSetting("Renderer", Settings::values.use_caches_gc);
|
||||||
|
@ -261,9 +261,9 @@ shader_backend =
|
|||||||
# 0 (default): Off, 1: On
|
# 0 (default): Off, 1: On
|
||||||
use_asynchronous_shaders =
|
use_asynchronous_shaders =
|
||||||
|
|
||||||
# Enable NVDEC emulation.
|
# NVDEC emulation.
|
||||||
# 0: Off, 1 (default): On
|
# 0: Disabled, 1: CPU Decoding, 2 (default): GPU Decoding
|
||||||
use_nvdec_emulation =
|
nvdec_emulation =
|
||||||
|
|
||||||
# Accelerate ASTC texture decoding.
|
# Accelerate ASTC texture decoding.
|
||||||
# 0: Off, 1 (default): On
|
# 0: Off, 1 (default): On
|
||||||
|
Loading…
Reference in New Issue
Block a user