Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

Proper linking between states

swurlb47c0e07a3f6
diff --git a/src/yuzu/configuration/configure_graphics_extensions.cpp b/src/yuzu/configuration/configure_graphics_extensions.cpp
index 28e11b78b7..b460dd0887 100644
--- a/src/yuzu/configuration/configure_graphics_extensions.cpp
+++ b/src/yuzu/configuration/configure_graphics_extensions.cpp
@@ -4,6 +4,7 @@
#include <vector>
#include <QLabel>
#include <qnamespace.h>
+#include <QCheckBox>
#include "common/settings.h"
#include "core/core.h"
#include "ui_configure_graphics_extensions.h"
@@ -32,6 +33,12 @@ void ConfigureGraphicsExtensions::Setup(const ConfigurationShared::Builder& buil
auto& layout = *ui->populate_target->layout();
std::map<u32, QWidget*> hold{}; // A map will sort the data for us
+ QCheckBox *dyna_state_1_box = nullptr;
+ QCheckBox *dyna_state_2_box = nullptr;
+ QCheckBox *dyna_state_2_extras_box = nullptr;
+ QCheckBox *dyna_state_3_box = nullptr;
+ QCheckBox *dyna_state_3_blend_box = nullptr;
+
for (auto setting :
Settings::values.linkage.by_category[Settings::Category::RendererExtensions]) {
ConfigurationShared::Widget* widget = builder.BuildWidget(setting, apply_funcs);
@@ -45,10 +52,119 @@ void ConfigureGraphicsExtensions::Setup(const ConfigurationShared::Builder& buil
}
hold.emplace(setting->Id(), widget);
+
+ if (setting->Id() == Settings::values.use_dyna_state_1.Id()) {
+ dyna_state_1_box = widget->checkbox;
+ } else if (setting->Id() == Settings::values.use_dyna_state_2.Id()) {
+ dyna_state_2_box = widget->checkbox;
+ } else if (setting->Id() == Settings::values.use_dyna_state_2_extras.Id()) {
+ dyna_state_2_extras_box = widget->checkbox;
+ } else if (setting->Id() == Settings::values.use_dyna_state_3.Id()) {
+ dyna_state_3_box = widget->checkbox;
+ } else if (setting->Id() == Settings::values.use_dyna_state_3_blend.Id()) {
+ dyna_state_3_blend_box = widget->checkbox;
+ }
}
+
for (const auto& [id, widget] : hold) {
layout.addWidget(widget);
}
+
+ // I hate everything about this
+ auto state_1_check = [=](int state) {
+ bool checked = state == (int) Qt::CheckState::Checked;
+
+ if (!checked) dyna_state_2_box->setChecked(false);
+ dyna_state_2_box->setEnabled(checked);
+ };
+
+ connect(dyna_state_1_box, &QCheckBox::stateChanged, this, state_1_check);
+
+ auto state_2_check = [=](int state) {
+ bool checked = state == (int) Qt::CheckState::Checked;
+ bool valid = dyna_state_1_box->isChecked();
+
+ if (!valid) {
+ // THIS IS SO BAD
+ if (!checked) {
+ emit dyna_state_2_box->clicked();
+ } else {
+ checked = false;
+ dyna_state_2_box->setChecked(false);
+ return;
+ }
+ }
+
+ if (!checked) {
+ dyna_state_2_extras_box->setChecked(false);
+ dyna_state_3_box->setChecked(false);
+ }
+
+ dyna_state_2_extras_box->setEnabled(checked);
+ dyna_state_3_box->setEnabled(checked);
+ };
+
+ connect(dyna_state_2_box, &QCheckBox::stateChanged, this, state_2_check);
+
+ auto state_3_check = [=](int state) {
+ bool checked = state == (int) Qt::CheckState::Checked;
+ bool valid = dyna_state_2_box->isChecked();
+
+ if (!valid) {
+ if (!checked) {
+ emit dyna_state_3_box->clicked();
+ } else {
+ checked = false;
+ dyna_state_3_box->setChecked(false);
+ return;
+ }
+ }
+
+ if (!checked) dyna_state_3_blend_box->setChecked(false);
+ dyna_state_3_blend_box->setEnabled(checked);
+ };
+
+ connect(dyna_state_3_box, &QCheckBox::stateChanged, this, state_3_check);
+
+ auto state_2_extras_check = [=](int state) {
+ bool checked = state == (int) Qt::CheckState::Checked;
+ bool valid = dyna_state_2_box->isChecked();
+
+ if (!valid) {
+ if (!checked) {
+ emit dyna_state_2_extras_box->clicked();
+ } else {
+ checked = false;
+ dyna_state_2_extras_box->setChecked(false);
+ return;
+ }
+ }
+ };
+
+ connect(dyna_state_2_extras_box, &QCheckBox::stateChanged, this, state_2_extras_check);
+
+ auto state_3_blend_check = [=](int state) {
+ bool checked = state == (int) Qt::CheckState::Checked;
+ bool valid = dyna_state_3_box->isChecked();
+
+ if (!valid) {
+ if (!checked) {
+ emit dyna_state_3_blend_box->clicked();
+ } else {
+ checked = false;
+ dyna_state_3_blend_box->setChecked(false);
+ return;
+ }
+ }
+ };
+
+ connect(dyna_state_3_blend_box, &QCheckBox::stateChanged, this, state_3_blend_check);
+
+ state_1_check((int) dyna_state_1_box->checkState());
+ state_2_check((int) dyna_state_2_box->checkState());
+ state_2_extras_check((int) dyna_state_2_extras_box->checkState());
+ state_3_check((int) dyna_state_3_box->checkState());
+ state_3_blend_check((int) dyna_state_3_blend_box->checkState());
}
void ConfigureGraphicsExtensions::ApplyConfiguration() {
diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp
index 63ebba2dc1..c14b35f58f 100644
--- a/src/yuzu/configuration/shared_translation.cpp
+++ b/src/yuzu/configuration/shared_translation.cpp
@@ -230,6 +230,7 @@ std::unique_ptr<TranslationMap> InitializeTranslations(QWidget* parent) {
INSERT(Settings, barrier_feedback_loops, tr("Barrier feedback loops"),
tr("Improves rendering of transparency effects in specific games."));
+ // Renderer (Extensions)
INSERT(Settings, use_dyna_state_1, tr("Enable Extended Dynamic State 1"),
tr("Enables the VkExtendedDynamicState1 extension.\nThis setting may improve performance, "
"but may also cause games to break on some systems."));