diff options
Diffstat (limited to 'src/yuzu')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics.ui | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.cpp | 6 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.ui | 14 | ||||
| -rw-r--r-- | src/yuzu/game_list.cpp | 8 | 
6 files changed, 7 insertions, 26 deletions
| diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index 377795326..85d292bcc 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -818,7 +818,6 @@ void Config::ReadRendererValues() {      ReadGlobalSetting(Settings::values.shader_backend);      ReadGlobalSetting(Settings::values.use_asynchronous_shaders);      ReadGlobalSetting(Settings::values.use_fast_gpu_time); -    ReadGlobalSetting(Settings::values.use_caches_gc);      ReadGlobalSetting(Settings::values.bg_red);      ReadGlobalSetting(Settings::values.bg_green);      ReadGlobalSetting(Settings::values.bg_blue); @@ -1359,7 +1358,6 @@ void Config::SaveRendererValues() {                   Settings::values.shader_backend.UsingGlobal());      WriteGlobalSetting(Settings::values.use_asynchronous_shaders);      WriteGlobalSetting(Settings::values.use_fast_gpu_time); -    WriteGlobalSetting(Settings::values.use_caches_gc);      WriteGlobalSetting(Settings::values.bg_red);      WriteGlobalSetting(Settings::values.bg_green);      WriteGlobalSetting(Settings::values.bg_blue); diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui index 099ddbb7c..43f1887d1 100644 --- a/src/yuzu/configuration/configure_graphics.ui +++ b/src/yuzu/configuration/configure_graphics.ui @@ -156,7 +156,7 @@          <item>           <widget class="QCheckBox" name="use_disk_shader_cache">            <property name="text"> -           <string>Use disk shader cache</string> +           <string>Use disk pipeline cache</string>            </property>           </widget>          </item> diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index a31b8e192..bfd464061 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -28,7 +28,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {      ui->use_vsync->setChecked(Settings::values.use_vsync.GetValue());      ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); -    ui->use_caches_gc->setChecked(Settings::values.use_caches_gc.GetValue());      ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue());      if (Settings::IsConfiguringGlobal()) { @@ -55,8 +54,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {      ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_asynchronous_shaders,                                               ui->use_asynchronous_shaders,                                               use_asynchronous_shaders); -    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_caches_gc, ui->use_caches_gc, -                                             use_caches_gc);      ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,                                               ui->use_fast_gpu_time, use_fast_gpu_time);  } @@ -81,7 +78,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {          ui->use_asynchronous_shaders->setEnabled(              Settings::values.use_asynchronous_shaders.UsingGlobal());          ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); -        ui->use_caches_gc->setEnabled(Settings::values.use_caches_gc.UsingGlobal());          ui->anisotropic_filtering_combobox->setEnabled(              Settings::values.max_anisotropy.UsingGlobal()); @@ -94,8 +90,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() {                                              use_asynchronous_shaders);      ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time,                                              Settings::values.use_fast_gpu_time, use_fast_gpu_time); -    ConfigurationShared::SetColoredTristate(ui->use_caches_gc, Settings::values.use_caches_gc, -                                            use_caches_gc);      ConfigurationShared::SetColoredComboBox(          ui->gpu_accuracy, ui->label_gpu_accuracy,          static_cast<int>(Settings::values.gpu_accuracy.GetValue(true))); diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h index 7356e6916..13ba4ff6b 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.h +++ b/src/yuzu/configuration/configure_graphics_advanced.h @@ -37,5 +37,4 @@ private:      ConfigurationShared::CheckState use_vsync;      ConfigurationShared::CheckState use_asynchronous_shaders;      ConfigurationShared::CheckState use_fast_gpu_time; -    ConfigurationShared::CheckState use_caches_gc;  }; diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index 4fe6b86ae..b91abc2f0 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -82,7 +82,7 @@             <string>Enables asynchronous shader compilation, which may reduce shader stutter. This feature is experimental.</string>            </property>            <property name="text"> -           <string>Use asynchronous shader building (hack)</string> +           <string>Use asynchronous shader building (Hack)</string>            </property>           </widget>          </item> @@ -92,17 +92,7 @@              <string>Enables Fast GPU Time. This option will force most games to run at their highest native resolution.</string>            </property>            <property name="text"> -           <string>Use Fast GPU Time (hack)</string> -          </property> -         </widget> -        </item> -        <item> -         <widget class="QCheckBox" name="use_caches_gc"> -          <property name="toolTip"> -           <string>Enables garbage collection for the GPU caches, this will try to keep VRAM within 3-4 GB by flushing the least used textures/buffers. May cause issues in a few games.</string> -          </property> -          <property name="text"> -           <string>Enable GPU cache garbage collection (experimental)</string> +           <string>Use Fast GPU Time (Hack)</string>            </property>           </widget>          </item> diff --git a/src/yuzu/game_list.cpp b/src/yuzu/game_list.cpp index e97804220..f9d949e75 100644 --- a/src/yuzu/game_list.cpp +++ b/src/yuzu/game_list.cpp @@ -515,16 +515,16 @@ void GameList::AddGamePopup(QMenu& context_menu, u64 program_id, const std::stri      QAction* open_save_location = context_menu.addAction(tr("Open Save Data Location"));      QAction* open_mod_location = context_menu.addAction(tr("Open Mod Data Location"));      QAction* open_transferable_shader_cache = -        context_menu.addAction(tr("Open Transferable Shader Cache")); +        context_menu.addAction(tr("Open Transferable Pipeline Cache"));      context_menu.addSeparator();      QMenu* remove_menu = context_menu.addMenu(tr("Remove"));      QAction* remove_update = remove_menu->addAction(tr("Remove Installed Update"));      QAction* remove_dlc = remove_menu->addAction(tr("Remove All Installed DLC"));      QAction* remove_custom_config = remove_menu->addAction(tr("Remove Custom Configuration")); -    QAction* remove_gl_shader_cache = remove_menu->addAction(tr("Remove OpenGL Shader Cache")); -    QAction* remove_vk_shader_cache = remove_menu->addAction(tr("Remove Vulkan Shader Cache")); +    QAction* remove_gl_shader_cache = remove_menu->addAction(tr("Remove OpenGL Pipeline Cache")); +    QAction* remove_vk_shader_cache = remove_menu->addAction(tr("Remove Vulkan Pipeline Cache"));      remove_menu->addSeparator(); -    QAction* remove_shader_cache = remove_menu->addAction(tr("Remove All Shader Caches")); +    QAction* remove_shader_cache = remove_menu->addAction(tr("Remove All Pipeline Caches"));      QAction* remove_all_content = remove_menu->addAction(tr("Remove All Installed Contents"));      QMenu* dump_romfs_menu = context_menu.addMenu(tr("Dump RomFS"));      QAction* dump_romfs = dump_romfs_menu->addAction(tr("Dump RomFS")); | 
