diff options
| -rw-r--r-- | src/common/settings.cpp | 1 | ||||
| -rw-r--r-- | src/common/settings.h | 1 | ||||
| -rw-r--r-- | src/video_core/compatible_formats.cpp | 20 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/gl_texture_cache.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_opengl/maxwell_to_gl.h | 3 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/maxwell_to_vk.cpp | 3 | ||||
| -rw-r--r-- | src/video_core/surface.cpp | 5 | ||||
| -rw-r--r-- | src/video_core/surface.h | 12 | ||||
| -rw-r--r-- | src/video_core/texture_cache/format_lookup_table.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/texture_cache/formatter.h | 6 | ||||
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 2 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.cpp | 8 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.h | 1 | ||||
| -rw-r--r-- | src/yuzu/configuration/configure_graphics_advanced.ui | 10 | ||||
| -rw-r--r-- | src/yuzu_cmd/config.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu_cmd/default_ini.h | 4 | 
16 files changed, 49 insertions, 37 deletions
| diff --git a/src/common/settings.cpp b/src/common/settings.cpp index cb1bca467..174460c5e 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -227,7 +227,6 @@ void RestoreGlobalState(bool is_powered_on) {      values.shader_backend.SetGlobal(true);      values.use_asynchronous_shaders.SetGlobal(true);      values.use_fast_gpu_time.SetGlobal(true); -    values.use_pessimistic_flushes.SetGlobal(true);      values.use_vulkan_driver_pipeline_cache.SetGlobal(true);      values.bg_red.SetGlobal(true);      values.bg_green.SetGlobal(true); diff --git a/src/common/settings.h b/src/common/settings.h index adebb0ca7..55200c36f 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -461,7 +461,6 @@ struct Values {                                                            ShaderBackend::SPIRV, "shader_backend"};      SwitchableSetting<bool> use_asynchronous_shaders{false, "use_asynchronous_shaders"};      SwitchableSetting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"}; -    SwitchableSetting<bool> use_pessimistic_flushes{false, "use_pessimistic_flushes"};      SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{true,                                                               "use_vulkan_driver_pipeline_cache"}; diff --git a/src/video_core/compatible_formats.cpp b/src/video_core/compatible_formats.cpp index 4e75f33ca..ab4f4d407 100644 --- a/src/video_core/compatible_formats.cpp +++ b/src/video_core/compatible_formats.cpp @@ -126,15 +126,14 @@ constexpr std::array VIEW_CLASS_ASTC_8x8_RGBA{      PixelFormat::ASTC_2D_8X8_SRGB,  }; -// Missing formats: -// PixelFormat::ASTC_2D_10X5_UNORM -// PixelFormat::ASTC_2D_10X5_SRGB - -// Missing formats: -// PixelFormat::ASTC_2D_10X6_SRGB +constexpr std::array VIEW_CLASS_ASTC_10x5_RGBA{ +    PixelFormat::ASTC_2D_10X5_UNORM, +    PixelFormat::ASTC_2D_10X5_SRGB, +};  constexpr std::array VIEW_CLASS_ASTC_10x6_RGBA{      PixelFormat::ASTC_2D_10X6_UNORM, +    PixelFormat::ASTC_2D_10X6_SRGB,  };  constexpr std::array VIEW_CLASS_ASTC_10x8_RGBA{ @@ -147,9 +146,10 @@ constexpr std::array VIEW_CLASS_ASTC_10x10_RGBA{      PixelFormat::ASTC_2D_10X10_SRGB,  }; -// Missing formats -// ASTC_2D_12X10_UNORM, -// ASTC_2D_12X10_SRGB, +constexpr std::array VIEW_CLASS_ASTC_12x10_RGBA{ +    PixelFormat::ASTC_2D_12X10_UNORM, +    PixelFormat::ASTC_2D_12X10_SRGB, +};  constexpr std::array VIEW_CLASS_ASTC_12x12_RGBA{      PixelFormat::ASTC_2D_12X12_UNORM, @@ -229,9 +229,11 @@ constexpr Table MakeViewTable() {      EnableRange(view, VIEW_CLASS_ASTC_6x6_RGBA);      EnableRange(view, VIEW_CLASS_ASTC_8x5_RGBA);      EnableRange(view, VIEW_CLASS_ASTC_8x8_RGBA); +    EnableRange(view, VIEW_CLASS_ASTC_10x5_RGBA);      EnableRange(view, VIEW_CLASS_ASTC_10x6_RGBA);      EnableRange(view, VIEW_CLASS_ASTC_10x8_RGBA);      EnableRange(view, VIEW_CLASS_ASTC_10x10_RGBA); +    EnableRange(view, VIEW_CLASS_ASTC_12x10_RGBA);      EnableRange(view, VIEW_CLASS_ASTC_12x12_RGBA);      return view;  } diff --git a/src/video_core/renderer_opengl/gl_texture_cache.cpp b/src/video_core/renderer_opengl/gl_texture_cache.cpp index 032a8ebc5..47cccd0e5 100644 --- a/src/video_core/renderer_opengl/gl_texture_cache.cpp +++ b/src/video_core/renderer_opengl/gl_texture_cache.cpp @@ -861,9 +861,12 @@ GLuint Image::StorageHandle() noexcept {      case PixelFormat::ASTC_2D_8X5_SRGB:      case PixelFormat::ASTC_2D_5X4_SRGB:      case PixelFormat::ASTC_2D_5X5_SRGB: +    case PixelFormat::ASTC_2D_10X5_SRGB: +    case PixelFormat::ASTC_2D_10X6_SRGB:      case PixelFormat::ASTC_2D_10X8_SRGB:      case PixelFormat::ASTC_2D_6X6_SRGB:      case PixelFormat::ASTC_2D_10X10_SRGB: +    case PixelFormat::ASTC_2D_12X10_SRGB:      case PixelFormat::ASTC_2D_12X12_SRGB:      case PixelFormat::ASTC_2D_8X6_SRGB:      case PixelFormat::ASTC_2D_6X5_SRGB: diff --git a/src/video_core/renderer_opengl/maxwell_to_gl.h b/src/video_core/renderer_opengl/maxwell_to_gl.h index ef1190e1f..c7dc7e0a1 100644 --- a/src/video_core/renderer_opengl/maxwell_to_gl.h +++ b/src/video_core/renderer_opengl/maxwell_to_gl.h @@ -100,10 +100,13 @@ constexpr std::array<FormatTuple, VideoCore::Surface::MaxPixelFormat> FORMAT_TAB      {GL_COMPRESSED_RGBA_ASTC_6x6_KHR},                                // ASTC_2D_6X6_UNORM      {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR},                        // ASTC_2D_6X6_SRGB      {GL_COMPRESSED_RGBA_ASTC_10x6_KHR},                               // ASTC_2D_10X6_UNORM +    {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR},                       // ASTC_2D_10X6_SRGB      {GL_COMPRESSED_RGBA_ASTC_10x5_KHR},                               // ASTC_2D_10X5_UNORM      {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR},                       // ASTC_2D_10X5_SRGB      {GL_COMPRESSED_RGBA_ASTC_10x10_KHR},                              // ASTC_2D_10X10_UNORM      {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR},                      // ASTC_2D_10X10_SRGB +    {GL_COMPRESSED_RGBA_ASTC_12x10_KHR},                              // ASTC_2D_12X10_UNORM +    {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR},                      // ASTC_2D_12X10_SRGB      {GL_COMPRESSED_RGBA_ASTC_12x12_KHR},                              // ASTC_2D_12X12_UNORM      {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR},                      // ASTC_2D_12X12_SRGB      {GL_COMPRESSED_RGBA_ASTC_8x6_KHR},                                // ASTC_2D_8X6_UNORM diff --git a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp index 5dce51be8..8853cf0f7 100644 --- a/src/video_core/renderer_vulkan/maxwell_to_vk.cpp +++ b/src/video_core/renderer_vulkan/maxwell_to_vk.cpp @@ -197,10 +197,13 @@ struct FormatTuple {      {VK_FORMAT_ASTC_6x6_UNORM_BLOCK},                          // ASTC_2D_6X6_UNORM      {VK_FORMAT_ASTC_6x6_SRGB_BLOCK},                           // ASTC_2D_6X6_SRGB      {VK_FORMAT_ASTC_10x6_UNORM_BLOCK},                         // ASTC_2D_10X6_UNORM +    {VK_FORMAT_ASTC_10x6_SRGB_BLOCK},                          // ASTC_2D_10X6_SRGB      {VK_FORMAT_ASTC_10x5_UNORM_BLOCK},                         // ASTC_2D_10X5_UNORM      {VK_FORMAT_ASTC_10x5_SRGB_BLOCK},                          // ASTC_2D_10X5_SRGB      {VK_FORMAT_ASTC_10x10_UNORM_BLOCK},                        // ASTC_2D_10X10_UNORM      {VK_FORMAT_ASTC_10x10_SRGB_BLOCK},                         // ASTC_2D_10X10_SRGB +    {VK_FORMAT_ASTC_12x10_UNORM_BLOCK},                        // ASTC_2D_12X10_UNORM +    {VK_FORMAT_ASTC_12x10_SRGB_BLOCK},                         // ASTC_2D_12X10_SRGB      {VK_FORMAT_ASTC_12x12_UNORM_BLOCK},                        // ASTC_2D_12X12_UNORM      {VK_FORMAT_ASTC_12x12_SRGB_BLOCK},                         // ASTC_2D_12X12_SRGB      {VK_FORMAT_ASTC_8x6_UNORM_BLOCK},                          // ASTC_2D_8X6_UNORM diff --git a/src/video_core/surface.cpp b/src/video_core/surface.cpp index 1a76d4178..cb51529e4 100644 --- a/src/video_core/surface.cpp +++ b/src/video_core/surface.cpp @@ -250,10 +250,13 @@ bool IsPixelFormatASTC(PixelFormat format) {      case PixelFormat::ASTC_2D_6X6_UNORM:      case PixelFormat::ASTC_2D_6X6_SRGB:      case PixelFormat::ASTC_2D_10X6_UNORM: +    case PixelFormat::ASTC_2D_10X6_SRGB:      case PixelFormat::ASTC_2D_10X5_UNORM:      case PixelFormat::ASTC_2D_10X5_SRGB:      case PixelFormat::ASTC_2D_10X10_UNORM:      case PixelFormat::ASTC_2D_10X10_SRGB: +    case PixelFormat::ASTC_2D_12X10_UNORM: +    case PixelFormat::ASTC_2D_12X10_SRGB:      case PixelFormat::ASTC_2D_12X12_UNORM:      case PixelFormat::ASTC_2D_12X12_SRGB:      case PixelFormat::ASTC_2D_8X6_UNORM: @@ -279,11 +282,13 @@ bool IsPixelFormatSRGB(PixelFormat format) {      case PixelFormat::ASTC_2D_8X5_SRGB:      case PixelFormat::ASTC_2D_5X4_SRGB:      case PixelFormat::ASTC_2D_5X5_SRGB: +    case PixelFormat::ASTC_2D_10X6_SRGB:      case PixelFormat::ASTC_2D_10X8_SRGB:      case PixelFormat::ASTC_2D_6X6_SRGB:      case PixelFormat::ASTC_2D_10X5_SRGB:      case PixelFormat::ASTC_2D_10X10_SRGB:      case PixelFormat::ASTC_2D_12X12_SRGB: +    case PixelFormat::ASTC_2D_12X10_SRGB:      case PixelFormat::ASTC_2D_8X6_SRGB:      case PixelFormat::ASTC_2D_6X5_SRGB:          return true; diff --git a/src/video_core/surface.h b/src/video_core/surface.h index 44b79af20..0225d3287 100644 --- a/src/video_core/surface.h +++ b/src/video_core/surface.h @@ -95,10 +95,13 @@ enum class PixelFormat {      ASTC_2D_6X6_UNORM,      ASTC_2D_6X6_SRGB,      ASTC_2D_10X6_UNORM, +    ASTC_2D_10X6_SRGB,      ASTC_2D_10X5_UNORM,      ASTC_2D_10X5_SRGB,      ASTC_2D_10X10_UNORM,      ASTC_2D_10X10_SRGB, +    ASTC_2D_12X10_UNORM, +    ASTC_2D_12X10_SRGB,      ASTC_2D_12X12_UNORM,      ASTC_2D_12X12_SRGB,      ASTC_2D_8X6_UNORM, @@ -232,10 +235,13 @@ constexpr std::array<u8, MaxPixelFormat> BLOCK_WIDTH_TABLE = {{      6,  // ASTC_2D_6X6_UNORM      6,  // ASTC_2D_6X6_SRGB      10, // ASTC_2D_10X6_UNORM +    10, // ASTC_2D_10X6_SRGB      10, // ASTC_2D_10X5_UNORM      10, // ASTC_2D_10X5_SRGB      10, // ASTC_2D_10X10_UNORM      10, // ASTC_2D_10X10_SRGB +    12, // ASTC_2D_12X10_UNORM +    12, // ASTC_2D_12X10_SRGB      12, // ASTC_2D_12X12_UNORM      12, // ASTC_2D_12X12_SRGB      8,  // ASTC_2D_8X6_UNORM @@ -338,10 +344,13 @@ constexpr std::array<u8, MaxPixelFormat> BLOCK_HEIGHT_TABLE = {{      6,  // ASTC_2D_6X6_UNORM      6,  // ASTC_2D_6X6_SRGB      6,  // ASTC_2D_10X6_UNORM +    6,  // ASTC_2D_10X6_SRGB      5,  // ASTC_2D_10X5_UNORM      5,  // ASTC_2D_10X5_SRGB      10, // ASTC_2D_10X10_UNORM      10, // ASTC_2D_10X10_SRGB +    10, // ASTC_2D_12X10_UNORM +    10, // ASTC_2D_12X10_SRGB      12, // ASTC_2D_12X12_UNORM      12, // ASTC_2D_12X12_SRGB      6,  // ASTC_2D_8X6_UNORM @@ -444,10 +453,13 @@ constexpr std::array<u8, MaxPixelFormat> BITS_PER_BLOCK_TABLE = {{      128, // ASTC_2D_6X6_UNORM      128, // ASTC_2D_6X6_SRGB      128, // ASTC_2D_10X6_UNORM +    128, // ASTC_2D_10X6_SRGB      128, // ASTC_2D_10X5_UNORM      128, // ASTC_2D_10X5_SRGB      128, // ASTC_2D_10X10_UNORM      128, // ASTC_2D_10X10_SRGB +    128, // ASTC_2D_12X10_UNORM +    128, // ASTC_2D_12X10_SRGB      128, // ASTC_2D_12X12_UNORM      128, // ASTC_2D_12X12_SRGB      128, // ASTC_2D_8X6_UNORM diff --git a/src/video_core/texture_cache/format_lookup_table.cpp b/src/video_core/texture_cache/format_lookup_table.cpp index 5fc2b2fec..11ced6c38 100644 --- a/src/video_core/texture_cache/format_lookup_table.cpp +++ b/src/video_core/texture_cache/format_lookup_table.cpp @@ -210,6 +210,8 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red,          return PixelFormat::ASTC_2D_6X6_SRGB;      case Hash(TextureFormat::ASTC_2D_10X6, UNORM, LINEAR):          return PixelFormat::ASTC_2D_10X6_UNORM; +    case Hash(TextureFormat::ASTC_2D_10X6, UNORM, SRGB): +        return PixelFormat::ASTC_2D_10X6_SRGB;      case Hash(TextureFormat::ASTC_2D_10X5, UNORM, LINEAR):          return PixelFormat::ASTC_2D_10X5_UNORM;      case Hash(TextureFormat::ASTC_2D_10X5, UNORM, SRGB): @@ -218,6 +220,10 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red,          return PixelFormat::ASTC_2D_10X10_UNORM;      case Hash(TextureFormat::ASTC_2D_10X10, UNORM, SRGB):          return PixelFormat::ASTC_2D_10X10_SRGB; +    case Hash(TextureFormat::ASTC_2D_12X10, UNORM, LINEAR): +        return PixelFormat::ASTC_2D_12X10_UNORM; +    case Hash(TextureFormat::ASTC_2D_12X10, UNORM, SRGB): +        return PixelFormat::ASTC_2D_12X10_SRGB;      case Hash(TextureFormat::ASTC_2D_12X12, UNORM, LINEAR):          return PixelFormat::ASTC_2D_12X12_UNORM;      case Hash(TextureFormat::ASTC_2D_12X12, UNORM, SRGB): diff --git a/src/video_core/texture_cache/formatter.h b/src/video_core/texture_cache/formatter.h index f1f0a057b..b97147797 100644 --- a/src/video_core/texture_cache/formatter.h +++ b/src/video_core/texture_cache/formatter.h @@ -179,6 +179,8 @@ struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::str                  return "ASTC_2D_6X6_SRGB";              case PixelFormat::ASTC_2D_10X6_UNORM:                  return "ASTC_2D_10X6_UNORM"; +            case PixelFormat::ASTC_2D_10X6_SRGB: +                return "ASTC_2D_10X6_SRGB";              case PixelFormat::ASTC_2D_10X5_UNORM:                  return "ASTC_2D_10X5_UNORM";              case PixelFormat::ASTC_2D_10X5_SRGB: @@ -187,6 +189,10 @@ struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::str                  return "ASTC_2D_10X10_UNORM";              case PixelFormat::ASTC_2D_10X10_SRGB:                  return "ASTC_2D_10X10_SRGB"; +            case PixelFormat::ASTC_2D_12X10_UNORM: +                return "ASTC_2D_12X10_UNORM"; +            case PixelFormat::ASTC_2D_12X10_SRGB: +                return "ASTC_2D_12X10_SRGB";              case PixelFormat::ASTC_2D_12X12_UNORM:                  return "ASTC_2D_12X12_UNORM";              case PixelFormat::ASTC_2D_12X12_SRGB: diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index be33e4d79..0131f63e7 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -713,7 +713,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_pessimistic_flushes);      ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);      ReadGlobalSetting(Settings::values.bg_red);      ReadGlobalSetting(Settings::values.bg_green); @@ -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_pessimistic_flushes);      WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache);      WriteGlobalSetting(Settings::values.bg_red);      WriteGlobalSetting(Settings::values.bg_green); diff --git a/src/yuzu/configuration/configure_graphics_advanced.cpp b/src/yuzu/configuration/configure_graphics_advanced.cpp index 7f7bf0e4d..ddda79983 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.cpp +++ b/src/yuzu/configuration/configure_graphics_advanced.cpp @@ -34,7 +34,6 @@ void ConfigureGraphicsAdvanced::SetConfiguration() {      ui->async_astc->setChecked(Settings::values.async_astc.GetValue());      ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue());      ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); -    ui->use_pessimistic_flushes->setChecked(Settings::values.use_pessimistic_flushes.GetValue());      ui->use_vulkan_driver_pipeline_cache->setChecked(          Settings::values.use_vulkan_driver_pipeline_cache.GetValue()); @@ -71,8 +70,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() {                                               use_asynchronous_shaders);      ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time,                                               ui->use_fast_gpu_time, use_fast_gpu_time); -    ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_pessimistic_flushes, -                                             ui->use_pessimistic_flushes, use_pessimistic_flushes);      ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache,                                               ui->use_vulkan_driver_pipeline_cache,                                               use_vulkan_driver_pipeline_cache); @@ -102,8 +99,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_pessimistic_flushes->setEnabled( -            Settings::values.use_pessimistic_flushes.UsingGlobal());          ui->use_vulkan_driver_pipeline_cache->setEnabled(              Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal());          ui->anisotropic_filtering_combobox->setEnabled( @@ -125,9 +120,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_pessimistic_flushes, -                                            Settings::values.use_pessimistic_flushes, -                                            use_pessimistic_flushes);      ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache,                                              Settings::values.use_vulkan_driver_pipeline_cache,                                              use_vulkan_driver_pipeline_cache); diff --git a/src/yuzu/configuration/configure_graphics_advanced.h b/src/yuzu/configuration/configure_graphics_advanced.h index 5394ed40a..ff5060957 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.h +++ b/src/yuzu/configuration/configure_graphics_advanced.h @@ -42,7 +42,6 @@ private:      ConfigurationShared::CheckState async_astc;      ConfigurationShared::CheckState use_asynchronous_shaders;      ConfigurationShared::CheckState use_fast_gpu_time; -    ConfigurationShared::CheckState use_pessimistic_flushes;      ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache;      const Core::System& system; diff --git a/src/yuzu/configuration/configure_graphics_advanced.ui b/src/yuzu/configuration/configure_graphics_advanced.ui index d7ec18939..1234f695c 100644 --- a/src/yuzu/configuration/configure_graphics_advanced.ui +++ b/src/yuzu/configuration/configure_graphics_advanced.ui @@ -127,16 +127,6 @@           </widget>          </item>          <item> -         <widget class="QCheckBox" name="use_pessimistic_flushes"> -          <property name="toolTip"> -           <string>Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance.</string> -          </property> -          <property name="text"> -           <string>Use pessimistic buffer flushes (Hack)</string> -          </property> -         </widget> -        </item> -        <item>           <widget class="QCheckBox" name="use_vulkan_driver_pipeline_cache">            <property name="toolTip">             <string>Enables GPU vendor-specific pipeline cache. This option can improve shader loading time significantly in cases where the Vulkan driver does not store pipeline cache files internally.</string> diff --git a/src/yuzu_cmd/config.cpp b/src/yuzu_cmd/config.cpp index e4f91d07c..605280949 100644 --- a/src/yuzu_cmd/config.cpp +++ b/src/yuzu_cmd/config.cpp @@ -327,7 +327,6 @@ void Config::ReadValues() {      ReadSetting("Renderer", Settings::values.accelerate_astc);      ReadSetting("Renderer", Settings::values.async_astc);      ReadSetting("Renderer", Settings::values.use_fast_gpu_time); -    ReadSetting("Renderer", Settings::values.use_pessimistic_flushes);      ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache);      ReadSetting("Renderer", Settings::values.bg_red); diff --git a/src/yuzu_cmd/default_ini.h b/src/yuzu_cmd/default_ini.h index f714eae17..db6fba922 100644 --- a/src/yuzu_cmd/default_ini.h +++ b/src/yuzu_cmd/default_ini.h @@ -374,10 +374,6 @@ use_asynchronous_gpu_emulation =  # 0: Off, 1 (default): On  use_fast_gpu_time = -# Force unmodified buffers to be flushed, which can cost performance. -# 0: Off (default), 1: On -use_pessimistic_flushes = -  # Whether to use garbage collection or not for GPU caches.  # 0 (default): Off, 1: On  use_caches_gc = | 
