prifak/yuzu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Removed Accurate and 30FPS buttons

Browse Source 
- Cleaner UI changes
- Added Vulkan preperations
This commit is contained in:
CJBok
2019-12-28 15:36:18 +01:00
parent c8aab9525f
commit 97ec3262f2
2 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
src/yuzu/main.cpp
View File

@@ -486,26 +486,27 @@ void GMainWindow::InitializeWidgets() {
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation); async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
statusBar()->addPermanentWidget(async_status_button, 0); statusBar()->addPermanentWidget(async_status_button, 0);
accurate_status_button = new QPushButton();
accurate_status_button->setText(tr("ACCUR"));
accurate_status_button->setObjectName(tr("StatusButton"));
accurate_status_button->setCheckable(true);
accurate_status_button->setChecked(Settings::values.use_accurate_gpu_emulation);
statusBar()->addPermanentWidget(accurate_status_button, 0);
fps30_status_button = new QPushButton();
fps30_status_button->setText(tr("30FPS"));
fps30_status_button->setObjectName(tr("StatusButton"));
fps30_status_button->setCheckable(true);
fps30_status_button->setChecked(Settings::values.force_30fps_mode);
statusBar()->addPermanentWidget(fps30_status_button, 0);
renderer_status_button = new QPushButton(); renderer_status_button = new QPushButton();
renderer_status_button->setCheckable(true);
#ifdef HAS_VULKAN
switch (Settings::values.renderer_backend) {
case Settings::RendererBackend::OpenGL:
renderer_status_button->setText(tr("OPENGL"));
renderer_status_button->setChecked(false);
break;
case Settings::RendererBackend::Vulkan:
renderer_status_button->setText(tr("VULKAN"));
renderer_status_button->setChecked(true);
break;
}
#else
renderer_status_button->setText(tr("OPENGL")); renderer_status_button->setText(tr("OPENGL"));
renderer_status_button->setObjectName(tr("StatusButton")); renderer_status_button->setChecked(false);
renderer_status_button->setDisabled(true); renderer_status_button->setDisabled(true);
renderer_status_button->setStyleSheet( #endif // HAS_VULKAN
QStringLiteral("QPushButton:disabled{border-color: #0000FF;}")); renderer_status_button->setObjectName(tr("StatusButton"));
renderer_status_button->setStyleSheet(QStringLiteral("QPushButton:checked{color: #e85c00;}"
"QPushButton:!checked{color: #00ccdd;}"));
statusBar()->addPermanentWidget(renderer_status_button, 0); statusBar()->addPermanentWidget(renderer_status_button, 0);
statusBar()->setVisible(true); statusBar()->setVisible(true);
@@ -756,8 +757,7 @@ void GMainWindow::ConnectWidgetEvents() {
connect(&status_bar_update_timer, &QTimer::timeout, this, &GMainWindow::UpdateStatusBar); connect(&status_bar_update_timer, &QTimer::timeout, this, &GMainWindow::UpdateStatusBar);
connect(async_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleASyncGPU); connect(async_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleASyncGPU);
connect(accurate_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleAccurateGPU); connect(renderer_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggleRendererAPI);
connect(fps30_status_button, &QPushButton::clicked, this, &GMainWindow::OnToggle30FPSGPU);
} }
void GMainWindow::ConnectMenuEvents() { void GMainWindow::ConnectMenuEvents() {
@@ -1035,8 +1035,6 @@ void GMainWindow::BootGame(const QString& filename) {
} }
status_bar_update_timer.start(2000); status_bar_update_timer.start(2000);
async_status_button->setDisabled(true); async_status_button->setDisabled(true);
accurate_status_button->setDisabled(true);
fps30_status_button->setDisabled(true);
renderer_status_button->setDisabled(true); renderer_status_button->setDisabled(true);
const u64 title_id = Core::System::GetInstance().CurrentProcess()->GetTitleID(); const u64 title_id = Core::System::GetInstance().CurrentProcess()->GetTitleID();
@@ -1108,8 +1106,9 @@ void GMainWindow::ShutdownGame() {
game_fps_label->setVisible(false); game_fps_label->setVisible(false);
emu_frametime_label->setVisible(false); emu_frametime_label->setVisible(false);
async_status_button->setEnabled(true); async_status_button->setEnabled(true);
accurate_status_button->setEnabled(true); #ifdef HAS_VULKAN
fps30_status_button->setEnabled(true); renderer_status_button->setEnabled(true);
#endif
emulation_running = false; emulation_running = false;
@@ -1879,8 +1878,18 @@ void GMainWindow::OnConfigure() {
config->Save(); config->Save();
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation); async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation);
accurate_status_button->setChecked(Settings::values.use_accurate_gpu_emulation); #ifdef HAS_VULKAN
fps30_status_button->setChecked(Settings::values.force_30fps_mode); switch (Settings::values.renderer_backend) {
case Settings::RendererBackend::OpenGL:
renderer_status_button->setText(tr("OPENGL"));
renderer_status_button->setChecked(false);
break;
case Settings::RendererBackend::Vulkan:
renderer_status_button->setText(tr("VULKAN"));
renderer_status_button->setChecked(true);
break;
}
#endif
} }
void GMainWindow::OnLoadAmiibo() { void GMainWindow::OnLoadAmiibo() {
@@ -2169,24 +2178,26 @@ void GMainWindow::OnToggleASyncGPU() {
Settings::Apply(); Settings::Apply();
} }
void GMainWindow::OnToggleAccurateGPU() { void GMainWindow::OnToggleRendererAPI() {
if (emulation_running) if (emulation_running)
return; return;
Settings::values.use_accurate_gpu_emulation = !Settings::values.use_accurate_gpu_emulation; #ifdef HAS_VULKAN
accurate_status_button->setChecked(Settings::values.use_accurate_gpu_emulation); switch (Settings::values.renderer_backend) {
case Settings::RendererBackend::OpenGL:
Settings::Apply(); Settings::values.renderer_backend = Settings::RendererBackend::OpenGL;
} renderer_status_button->setText(tr("OPENGL"));
renderer_status_button->setChecked(false);
void GMainWindow::OnToggle30FPSGPU() { break;
if (emulation_running) case Settings::RendererBackend::Vulkan:
return; Settings::values.renderer_backend = Settings::RendererBackend::Vulkan;
renderer_status_button->setText(tr("VULKAN"));
Settings::values.force_30fps_mode = !Settings::values.force_30fps_mode; renderer_status_button->setChecked(true);
fps30_status_button->setChecked(Settings::values.force_30fps_mode); break;
}
Settings::Apply(); Settings::Apply();
#endif // HAS_VULKAN
} }
std::optional<u64> GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProvider& installed, std::optional<u64> GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProvider& installed,

5
src/yuzu/main.h
View File

@@ -212,8 +212,7 @@ private slots:
void OnCoreError(Core::System::ResultStatus, std::string); void OnCoreError(Core::System::ResultStatus, std::string);
void OnReinitializeKeys(ReinitializeKeyBehavior behavior); void OnReinitializeKeys(ReinitializeKeyBehavior behavior);
void OnToggleASyncGPU(); void OnToggleASyncGPU();
void OnToggleAccurateGPU(); void OnToggleRendererAPI();
void OnToggle30FPSGPU();
private: private:
std::optional<u64> SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id); std::optional<u64> SelectRomFSDumpTarget(const FileSys::ContentProvider&, u64 program_id);
@@ -234,8 +233,6 @@ private:
QLabel* game_fps_label = nullptr; QLabel* game_fps_label = nullptr;
QLabel* emu_frametime_label = nullptr; QLabel* emu_frametime_label = nullptr;
QPushButton* async_status_button = nullptr; QPushButton* async_status_button = nullptr;
QPushButton* accurate_status_button = nullptr;
QPushButton* fps30_status_button = nullptr;
QPushButton* renderer_status_button = nullptr; QPushButton* renderer_status_button = nullptr;
QTimer status_bar_update_timer; QTimer status_bar_update_timer;