From 59be9dc36e38d350f38ef948ac5b9d2ccee47a94 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 19 Nov 2017 00:55:57 +0100 Subject: [PATCH] Qt: move "Disable Vertex Cache" option back to gpu tab --- rpcs3/Json/tooltips.json | 2 +- rpcs3/rpcs3qt/settings_dialog.cpp | 6 +++--- rpcs3/rpcs3qt/settings_dialog.ui | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rpcs3/Json/tooltips.json b/rpcs3/Json/tooltips.json index cc42c77fb2..731e4dc881 100644 --- a/rpcs3/Json/tooltips.json +++ b/rpcs3/Json/tooltips.json @@ -46,7 +46,6 @@ "debugOverlay": "Provides a graphical overlay of various debugging information.\nIf unsure, don't use this option.", "logProg": "Dump game shaders to file. Only useful to developers.\nIf unsure, don't use this option.", "disableOcclusionQueries": "Disables running occlusion queries. Minor to moderate performance boost.\nMight introduce issues with broken occlusion e.g missing geometry and extreme pop-in.", - "disableVertexCache": "Disables the vertex cache.\nMight resolve missing or flickering graphics output.\nMay degrade performance.", "forceCpuBlitEmulation": "Forces emulation of all blit and image manipulation operations on the CPU.\nRequires 'Write Color Buffers' option to also be enabled in most cases to avoid missing graphics.\nSignificantly degrades performance but is more accurate in some cases.\nThis setting overrides the 'GPU texture scaling' option." }, "emulator": { @@ -85,6 +84,7 @@ "vsync": "By having this off you might obtain a higher frame rate at the cost of tearing artifacts in the game.", "gpuTextureScaling": "Small to significant performance boost in most games and rarely with side effects.\nMay cause texture corruption in rare cases.", "scrictModeRendering": "Enforces strict compliance to the API specification.\nMight result in degraded performance in some games.\nCan resolve rare cases of missing graphics and flickering.\nIf unsure, don't use this option.", + "disableVertexCache": "Disables the vertex cache.\nMight resolve missing or flickering graphics output.\nMay degrade performance.", "stretchToDisplayArea": "Overrides the aspect ratio and stretches the image to the full display area." } }, diff --git a/rpcs3/rpcs3qt/settings_dialog.cpp b/rpcs3/rpcs3qt/settings_dialog.cpp index db2fdbd7a6..028ac4d8c8 100644 --- a/rpcs3/rpcs3qt/settings_dialog.cpp +++ b/rpcs3/rpcs3qt/settings_dialog.cpp @@ -420,6 +420,9 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: xemu_settings->EnhanceCheckBox(ui->stretchToDisplayArea, emu_settings::StretchToDisplayArea); SubscribeTooltip(ui->stretchToDisplayArea, json_gpu_main["stretchToDisplayArea"].toString()); + xemu_settings->EnhanceCheckBox(ui->disableVertexCache, emu_settings::DisableVertexCache); + SubscribeTooltip(ui->disableVertexCache, json_gpu_main["disableVertexCache"].toString()); + xemu_settings->EnhanceCheckBox(ui->scrictModeRendering, emu_settings::StrictRenderingMode); SubscribeTooltip(ui->scrictModeRendering, json_gpu_main["scrictModeRendering"].toString()); connect(ui->scrictModeRendering, &QCheckBox::clicked, [=](bool checked) @@ -945,9 +948,6 @@ settings_dialog::settings_dialog(std::shared_ptr guiSettings, std: xemu_settings->EnhanceCheckBox(ui->readDepth, emu_settings::ReadDepthBuffer); SubscribeTooltip(ui->readDepth, json_debug["readDepth"].toString()); - xemu_settings->EnhanceCheckBox(ui->disableVertexCache, emu_settings::DisableVertexCache); - SubscribeTooltip(ui->disableVertexCache, json_debug["disableVertexCache"].toString()); - xemu_settings->EnhanceCheckBox(ui->disableHwOcclusionQueries, emu_settings::DisableOcclusionQueries); SubscribeTooltip(ui->disableHwOcclusionQueries, json_debug["disableOcclusionQueries"].toString()); diff --git a/rpcs3/rpcs3qt/settings_dialog.ui b/rpcs3/rpcs3qt/settings_dialog.ui index 69e2f67826..937aa83f4f 100644 --- a/rpcs3/rpcs3qt/settings_dialog.ui +++ b/rpcs3/rpcs3qt/settings_dialog.ui @@ -534,6 +534,13 @@ + + + + Disable Vertex Cache + + + @@ -1547,13 +1554,6 @@ - - - - Disable Vertex Cache - - -