diff options
Diffstat (limited to 'src')
| -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) { | |||
| 227 | values.shader_backend.SetGlobal(true); | 227 | values.shader_backend.SetGlobal(true); |
| 228 | values.use_asynchronous_shaders.SetGlobal(true); | 228 | values.use_asynchronous_shaders.SetGlobal(true); |
| 229 | values.use_fast_gpu_time.SetGlobal(true); | 229 | values.use_fast_gpu_time.SetGlobal(true); |
| 230 | values.use_pessimistic_flushes.SetGlobal(true); | ||
| 231 | values.use_vulkan_driver_pipeline_cache.SetGlobal(true); | 230 | values.use_vulkan_driver_pipeline_cache.SetGlobal(true); |
| 232 | values.bg_red.SetGlobal(true); | 231 | values.bg_red.SetGlobal(true); |
| 233 | values.bg_green.SetGlobal(true); | 232 | 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 { | |||
| 461 | ShaderBackend::SPIRV, "shader_backend"}; | 461 | ShaderBackend::SPIRV, "shader_backend"}; |
| 462 | SwitchableSetting<bool> use_asynchronous_shaders{false, "use_asynchronous_shaders"}; | 462 | SwitchableSetting<bool> use_asynchronous_shaders{false, "use_asynchronous_shaders"}; |
| 463 | SwitchableSetting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"}; | 463 | SwitchableSetting<bool> use_fast_gpu_time{true, "use_fast_gpu_time"}; |
| 464 | SwitchableSetting<bool> use_pessimistic_flushes{false, "use_pessimistic_flushes"}; | ||
| 465 | SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{true, | 464 | SwitchableSetting<bool> use_vulkan_driver_pipeline_cache{true, |
| 466 | "use_vulkan_driver_pipeline_cache"}; | 465 | "use_vulkan_driver_pipeline_cache"}; |
| 467 | 466 | ||
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{ | |||
| 126 | PixelFormat::ASTC_2D_8X8_SRGB, | 126 | PixelFormat::ASTC_2D_8X8_SRGB, |
| 127 | }; | 127 | }; |
| 128 | 128 | ||
| 129 | // Missing formats: | 129 | constexpr std::array VIEW_CLASS_ASTC_10x5_RGBA{ |
| 130 | // PixelFormat::ASTC_2D_10X5_UNORM | 130 | PixelFormat::ASTC_2D_10X5_UNORM, |
| 131 | // PixelFormat::ASTC_2D_10X5_SRGB | 131 | PixelFormat::ASTC_2D_10X5_SRGB, |
| 132 | 132 | }; | |
| 133 | // Missing formats: | ||
| 134 | // PixelFormat::ASTC_2D_10X6_SRGB | ||
| 135 | 133 | ||
| 136 | constexpr std::array VIEW_CLASS_ASTC_10x6_RGBA{ | 134 | constexpr std::array VIEW_CLASS_ASTC_10x6_RGBA{ |
| 137 | PixelFormat::ASTC_2D_10X6_UNORM, | 135 | PixelFormat::ASTC_2D_10X6_UNORM, |
| 136 | PixelFormat::ASTC_2D_10X6_SRGB, | ||
| 138 | }; | 137 | }; |
| 139 | 138 | ||
| 140 | constexpr std::array VIEW_CLASS_ASTC_10x8_RGBA{ | 139 | constexpr std::array VIEW_CLASS_ASTC_10x8_RGBA{ |
| @@ -147,9 +146,10 @@ constexpr std::array VIEW_CLASS_ASTC_10x10_RGBA{ | |||
| 147 | PixelFormat::ASTC_2D_10X10_SRGB, | 146 | PixelFormat::ASTC_2D_10X10_SRGB, |
| 148 | }; | 147 | }; |
| 149 | 148 | ||
| 150 | // Missing formats | 149 | constexpr std::array VIEW_CLASS_ASTC_12x10_RGBA{ |
| 151 | // ASTC_2D_12X10_UNORM, | 150 | PixelFormat::ASTC_2D_12X10_UNORM, |
| 152 | // ASTC_2D_12X10_SRGB, | 151 | PixelFormat::ASTC_2D_12X10_SRGB, |
| 152 | }; | ||
| 153 | 153 | ||
| 154 | constexpr std::array VIEW_CLASS_ASTC_12x12_RGBA{ | 154 | constexpr std::array VIEW_CLASS_ASTC_12x12_RGBA{ |
| 155 | PixelFormat::ASTC_2D_12X12_UNORM, | 155 | PixelFormat::ASTC_2D_12X12_UNORM, |
| @@ -229,9 +229,11 @@ constexpr Table MakeViewTable() { | |||
| 229 | EnableRange(view, VIEW_CLASS_ASTC_6x6_RGBA); | 229 | EnableRange(view, VIEW_CLASS_ASTC_6x6_RGBA); |
| 230 | EnableRange(view, VIEW_CLASS_ASTC_8x5_RGBA); | 230 | EnableRange(view, VIEW_CLASS_ASTC_8x5_RGBA); |
| 231 | EnableRange(view, VIEW_CLASS_ASTC_8x8_RGBA); | 231 | EnableRange(view, VIEW_CLASS_ASTC_8x8_RGBA); |
| 232 | EnableRange(view, VIEW_CLASS_ASTC_10x5_RGBA); | ||
| 232 | EnableRange(view, VIEW_CLASS_ASTC_10x6_RGBA); | 233 | EnableRange(view, VIEW_CLASS_ASTC_10x6_RGBA); |
| 233 | EnableRange(view, VIEW_CLASS_ASTC_10x8_RGBA); | 234 | EnableRange(view, VIEW_CLASS_ASTC_10x8_RGBA); |
| 234 | EnableRange(view, VIEW_CLASS_ASTC_10x10_RGBA); | 235 | EnableRange(view, VIEW_CLASS_ASTC_10x10_RGBA); |
| 236 | EnableRange(view, VIEW_CLASS_ASTC_12x10_RGBA); | ||
| 235 | EnableRange(view, VIEW_CLASS_ASTC_12x12_RGBA); | 237 | EnableRange(view, VIEW_CLASS_ASTC_12x12_RGBA); |
| 236 | return view; | 238 | return view; |
| 237 | } | 239 | } |
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 { | |||
| 861 | case PixelFormat::ASTC_2D_8X5_SRGB: | 861 | case PixelFormat::ASTC_2D_8X5_SRGB: |
| 862 | case PixelFormat::ASTC_2D_5X4_SRGB: | 862 | case PixelFormat::ASTC_2D_5X4_SRGB: |
| 863 | case PixelFormat::ASTC_2D_5X5_SRGB: | 863 | case PixelFormat::ASTC_2D_5X5_SRGB: |
| 864 | case PixelFormat::ASTC_2D_10X5_SRGB: | ||
| 865 | case PixelFormat::ASTC_2D_10X6_SRGB: | ||
| 864 | case PixelFormat::ASTC_2D_10X8_SRGB: | 866 | case PixelFormat::ASTC_2D_10X8_SRGB: |
| 865 | case PixelFormat::ASTC_2D_6X6_SRGB: | 867 | case PixelFormat::ASTC_2D_6X6_SRGB: |
| 866 | case PixelFormat::ASTC_2D_10X10_SRGB: | 868 | case PixelFormat::ASTC_2D_10X10_SRGB: |
| 869 | case PixelFormat::ASTC_2D_12X10_SRGB: | ||
| 867 | case PixelFormat::ASTC_2D_12X12_SRGB: | 870 | case PixelFormat::ASTC_2D_12X12_SRGB: |
| 868 | case PixelFormat::ASTC_2D_8X6_SRGB: | 871 | case PixelFormat::ASTC_2D_8X6_SRGB: |
| 869 | case PixelFormat::ASTC_2D_6X5_SRGB: | 872 | 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 | |||
| 100 | {GL_COMPRESSED_RGBA_ASTC_6x6_KHR}, // ASTC_2D_6X6_UNORM | 100 | {GL_COMPRESSED_RGBA_ASTC_6x6_KHR}, // ASTC_2D_6X6_UNORM |
| 101 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR}, // ASTC_2D_6X6_SRGB | 101 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR}, // ASTC_2D_6X6_SRGB |
| 102 | {GL_COMPRESSED_RGBA_ASTC_10x6_KHR}, // ASTC_2D_10X6_UNORM | 102 | {GL_COMPRESSED_RGBA_ASTC_10x6_KHR}, // ASTC_2D_10X6_UNORM |
| 103 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR}, // ASTC_2D_10X6_SRGB | ||
| 103 | {GL_COMPRESSED_RGBA_ASTC_10x5_KHR}, // ASTC_2D_10X5_UNORM | 104 | {GL_COMPRESSED_RGBA_ASTC_10x5_KHR}, // ASTC_2D_10X5_UNORM |
| 104 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR}, // ASTC_2D_10X5_SRGB | 105 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR}, // ASTC_2D_10X5_SRGB |
| 105 | {GL_COMPRESSED_RGBA_ASTC_10x10_KHR}, // ASTC_2D_10X10_UNORM | 106 | {GL_COMPRESSED_RGBA_ASTC_10x10_KHR}, // ASTC_2D_10X10_UNORM |
| 106 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR}, // ASTC_2D_10X10_SRGB | 107 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR}, // ASTC_2D_10X10_SRGB |
| 108 | {GL_COMPRESSED_RGBA_ASTC_12x10_KHR}, // ASTC_2D_12X10_UNORM | ||
| 109 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR}, // ASTC_2D_12X10_SRGB | ||
| 107 | {GL_COMPRESSED_RGBA_ASTC_12x12_KHR}, // ASTC_2D_12X12_UNORM | 110 | {GL_COMPRESSED_RGBA_ASTC_12x12_KHR}, // ASTC_2D_12X12_UNORM |
| 108 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR}, // ASTC_2D_12X12_SRGB | 111 | {GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR}, // ASTC_2D_12X12_SRGB |
| 109 | {GL_COMPRESSED_RGBA_ASTC_8x6_KHR}, // ASTC_2D_8X6_UNORM | 112 | {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 { | |||
| 197 | {VK_FORMAT_ASTC_6x6_UNORM_BLOCK}, // ASTC_2D_6X6_UNORM | 197 | {VK_FORMAT_ASTC_6x6_UNORM_BLOCK}, // ASTC_2D_6X6_UNORM |
| 198 | {VK_FORMAT_ASTC_6x6_SRGB_BLOCK}, // ASTC_2D_6X6_SRGB | 198 | {VK_FORMAT_ASTC_6x6_SRGB_BLOCK}, // ASTC_2D_6X6_SRGB |
| 199 | {VK_FORMAT_ASTC_10x6_UNORM_BLOCK}, // ASTC_2D_10X6_UNORM | 199 | {VK_FORMAT_ASTC_10x6_UNORM_BLOCK}, // ASTC_2D_10X6_UNORM |
| 200 | {VK_FORMAT_ASTC_10x6_SRGB_BLOCK}, // ASTC_2D_10X6_SRGB | ||
| 200 | {VK_FORMAT_ASTC_10x5_UNORM_BLOCK}, // ASTC_2D_10X5_UNORM | 201 | {VK_FORMAT_ASTC_10x5_UNORM_BLOCK}, // ASTC_2D_10X5_UNORM |
| 201 | {VK_FORMAT_ASTC_10x5_SRGB_BLOCK}, // ASTC_2D_10X5_SRGB | 202 | {VK_FORMAT_ASTC_10x5_SRGB_BLOCK}, // ASTC_2D_10X5_SRGB |
| 202 | {VK_FORMAT_ASTC_10x10_UNORM_BLOCK}, // ASTC_2D_10X10_UNORM | 203 | {VK_FORMAT_ASTC_10x10_UNORM_BLOCK}, // ASTC_2D_10X10_UNORM |
| 203 | {VK_FORMAT_ASTC_10x10_SRGB_BLOCK}, // ASTC_2D_10X10_SRGB | 204 | {VK_FORMAT_ASTC_10x10_SRGB_BLOCK}, // ASTC_2D_10X10_SRGB |
| 205 | {VK_FORMAT_ASTC_12x10_UNORM_BLOCK}, // ASTC_2D_12X10_UNORM | ||
| 206 | {VK_FORMAT_ASTC_12x10_SRGB_BLOCK}, // ASTC_2D_12X10_SRGB | ||
| 204 | {VK_FORMAT_ASTC_12x12_UNORM_BLOCK}, // ASTC_2D_12X12_UNORM | 207 | {VK_FORMAT_ASTC_12x12_UNORM_BLOCK}, // ASTC_2D_12X12_UNORM |
| 205 | {VK_FORMAT_ASTC_12x12_SRGB_BLOCK}, // ASTC_2D_12X12_SRGB | 208 | {VK_FORMAT_ASTC_12x12_SRGB_BLOCK}, // ASTC_2D_12X12_SRGB |
| 206 | {VK_FORMAT_ASTC_8x6_UNORM_BLOCK}, // ASTC_2D_8X6_UNORM | 209 | {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) { | |||
| 250 | case PixelFormat::ASTC_2D_6X6_UNORM: | 250 | case PixelFormat::ASTC_2D_6X6_UNORM: |
| 251 | case PixelFormat::ASTC_2D_6X6_SRGB: | 251 | case PixelFormat::ASTC_2D_6X6_SRGB: |
| 252 | case PixelFormat::ASTC_2D_10X6_UNORM: | 252 | case PixelFormat::ASTC_2D_10X6_UNORM: |
| 253 | case PixelFormat::ASTC_2D_10X6_SRGB: | ||
| 253 | case PixelFormat::ASTC_2D_10X5_UNORM: | 254 | case PixelFormat::ASTC_2D_10X5_UNORM: |
| 254 | case PixelFormat::ASTC_2D_10X5_SRGB: | 255 | case PixelFormat::ASTC_2D_10X5_SRGB: |
| 255 | case PixelFormat::ASTC_2D_10X10_UNORM: | 256 | case PixelFormat::ASTC_2D_10X10_UNORM: |
| 256 | case PixelFormat::ASTC_2D_10X10_SRGB: | 257 | case PixelFormat::ASTC_2D_10X10_SRGB: |
| 258 | case PixelFormat::ASTC_2D_12X10_UNORM: | ||
| 259 | case PixelFormat::ASTC_2D_12X10_SRGB: | ||
| 257 | case PixelFormat::ASTC_2D_12X12_UNORM: | 260 | case PixelFormat::ASTC_2D_12X12_UNORM: |
| 258 | case PixelFormat::ASTC_2D_12X12_SRGB: | 261 | case PixelFormat::ASTC_2D_12X12_SRGB: |
| 259 | case PixelFormat::ASTC_2D_8X6_UNORM: | 262 | case PixelFormat::ASTC_2D_8X6_UNORM: |
| @@ -279,11 +282,13 @@ bool IsPixelFormatSRGB(PixelFormat format) { | |||
| 279 | case PixelFormat::ASTC_2D_8X5_SRGB: | 282 | case PixelFormat::ASTC_2D_8X5_SRGB: |
| 280 | case PixelFormat::ASTC_2D_5X4_SRGB: | 283 | case PixelFormat::ASTC_2D_5X4_SRGB: |
| 281 | case PixelFormat::ASTC_2D_5X5_SRGB: | 284 | case PixelFormat::ASTC_2D_5X5_SRGB: |
| 285 | case PixelFormat::ASTC_2D_10X6_SRGB: | ||
| 282 | case PixelFormat::ASTC_2D_10X8_SRGB: | 286 | case PixelFormat::ASTC_2D_10X8_SRGB: |
| 283 | case PixelFormat::ASTC_2D_6X6_SRGB: | 287 | case PixelFormat::ASTC_2D_6X6_SRGB: |
| 284 | case PixelFormat::ASTC_2D_10X5_SRGB: | 288 | case PixelFormat::ASTC_2D_10X5_SRGB: |
| 285 | case PixelFormat::ASTC_2D_10X10_SRGB: | 289 | case PixelFormat::ASTC_2D_10X10_SRGB: |
| 286 | case PixelFormat::ASTC_2D_12X12_SRGB: | 290 | case PixelFormat::ASTC_2D_12X12_SRGB: |
| 291 | case PixelFormat::ASTC_2D_12X10_SRGB: | ||
| 287 | case PixelFormat::ASTC_2D_8X6_SRGB: | 292 | case PixelFormat::ASTC_2D_8X6_SRGB: |
| 288 | case PixelFormat::ASTC_2D_6X5_SRGB: | 293 | case PixelFormat::ASTC_2D_6X5_SRGB: |
| 289 | return true; | 294 | 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 { | |||
| 95 | ASTC_2D_6X6_UNORM, | 95 | ASTC_2D_6X6_UNORM, |
| 96 | ASTC_2D_6X6_SRGB, | 96 | ASTC_2D_6X6_SRGB, |
| 97 | ASTC_2D_10X6_UNORM, | 97 | ASTC_2D_10X6_UNORM, |
| 98 | ASTC_2D_10X6_SRGB, | ||
| 98 | ASTC_2D_10X5_UNORM, | 99 | ASTC_2D_10X5_UNORM, |
| 99 | ASTC_2D_10X5_SRGB, | 100 | ASTC_2D_10X5_SRGB, |
| 100 | ASTC_2D_10X10_UNORM, | 101 | ASTC_2D_10X10_UNORM, |
| 101 | ASTC_2D_10X10_SRGB, | 102 | ASTC_2D_10X10_SRGB, |
| 103 | ASTC_2D_12X10_UNORM, | ||
| 104 | ASTC_2D_12X10_SRGB, | ||
| 102 | ASTC_2D_12X12_UNORM, | 105 | ASTC_2D_12X12_UNORM, |
| 103 | ASTC_2D_12X12_SRGB, | 106 | ASTC_2D_12X12_SRGB, |
| 104 | ASTC_2D_8X6_UNORM, | 107 | ASTC_2D_8X6_UNORM, |
| @@ -232,10 +235,13 @@ constexpr std::array<u8, MaxPixelFormat> BLOCK_WIDTH_TABLE = {{ | |||
| 232 | 6, // ASTC_2D_6X6_UNORM | 235 | 6, // ASTC_2D_6X6_UNORM |
| 233 | 6, // ASTC_2D_6X6_SRGB | 236 | 6, // ASTC_2D_6X6_SRGB |
| 234 | 10, // ASTC_2D_10X6_UNORM | 237 | 10, // ASTC_2D_10X6_UNORM |
| 238 | 10, // ASTC_2D_10X6_SRGB | ||
| 235 | 10, // ASTC_2D_10X5_UNORM | 239 | 10, // ASTC_2D_10X5_UNORM |
| 236 | 10, // ASTC_2D_10X5_SRGB | 240 | 10, // ASTC_2D_10X5_SRGB |
| 237 | 10, // ASTC_2D_10X10_UNORM | 241 | 10, // ASTC_2D_10X10_UNORM |
| 238 | 10, // ASTC_2D_10X10_SRGB | 242 | 10, // ASTC_2D_10X10_SRGB |
| 243 | 12, // ASTC_2D_12X10_UNORM | ||
| 244 | 12, // ASTC_2D_12X10_SRGB | ||
| 239 | 12, // ASTC_2D_12X12_UNORM | 245 | 12, // ASTC_2D_12X12_UNORM |
| 240 | 12, // ASTC_2D_12X12_SRGB | 246 | 12, // ASTC_2D_12X12_SRGB |
| 241 | 8, // ASTC_2D_8X6_UNORM | 247 | 8, // ASTC_2D_8X6_UNORM |
| @@ -338,10 +344,13 @@ constexpr std::array<u8, MaxPixelFormat> BLOCK_HEIGHT_TABLE = {{ | |||
| 338 | 6, // ASTC_2D_6X6_UNORM | 344 | 6, // ASTC_2D_6X6_UNORM |
| 339 | 6, // ASTC_2D_6X6_SRGB | 345 | 6, // ASTC_2D_6X6_SRGB |
| 340 | 6, // ASTC_2D_10X6_UNORM | 346 | 6, // ASTC_2D_10X6_UNORM |
| 347 | 6, // ASTC_2D_10X6_SRGB | ||
| 341 | 5, // ASTC_2D_10X5_UNORM | 348 | 5, // ASTC_2D_10X5_UNORM |
| 342 | 5, // ASTC_2D_10X5_SRGB | 349 | 5, // ASTC_2D_10X5_SRGB |
| 343 | 10, // ASTC_2D_10X10_UNORM | 350 | 10, // ASTC_2D_10X10_UNORM |
| 344 | 10, // ASTC_2D_10X10_SRGB | 351 | 10, // ASTC_2D_10X10_SRGB |
| 352 | 10, // ASTC_2D_12X10_UNORM | ||
| 353 | 10, // ASTC_2D_12X10_SRGB | ||
| 345 | 12, // ASTC_2D_12X12_UNORM | 354 | 12, // ASTC_2D_12X12_UNORM |
| 346 | 12, // ASTC_2D_12X12_SRGB | 355 | 12, // ASTC_2D_12X12_SRGB |
| 347 | 6, // ASTC_2D_8X6_UNORM | 356 | 6, // ASTC_2D_8X6_UNORM |
| @@ -444,10 +453,13 @@ constexpr std::array<u8, MaxPixelFormat> BITS_PER_BLOCK_TABLE = {{ | |||
| 444 | 128, // ASTC_2D_6X6_UNORM | 453 | 128, // ASTC_2D_6X6_UNORM |
| 445 | 128, // ASTC_2D_6X6_SRGB | 454 | 128, // ASTC_2D_6X6_SRGB |
| 446 | 128, // ASTC_2D_10X6_UNORM | 455 | 128, // ASTC_2D_10X6_UNORM |
| 456 | 128, // ASTC_2D_10X6_SRGB | ||
| 447 | 128, // ASTC_2D_10X5_UNORM | 457 | 128, // ASTC_2D_10X5_UNORM |
| 448 | 128, // ASTC_2D_10X5_SRGB | 458 | 128, // ASTC_2D_10X5_SRGB |
| 449 | 128, // ASTC_2D_10X10_UNORM | 459 | 128, // ASTC_2D_10X10_UNORM |
| 450 | 128, // ASTC_2D_10X10_SRGB | 460 | 128, // ASTC_2D_10X10_SRGB |
| 461 | 128, // ASTC_2D_12X10_UNORM | ||
| 462 | 128, // ASTC_2D_12X10_SRGB | ||
| 451 | 128, // ASTC_2D_12X12_UNORM | 463 | 128, // ASTC_2D_12X12_UNORM |
| 452 | 128, // ASTC_2D_12X12_SRGB | 464 | 128, // ASTC_2D_12X12_SRGB |
| 453 | 128, // ASTC_2D_8X6_UNORM | 465 | 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, | |||
| 210 | return PixelFormat::ASTC_2D_6X6_SRGB; | 210 | return PixelFormat::ASTC_2D_6X6_SRGB; |
| 211 | case Hash(TextureFormat::ASTC_2D_10X6, UNORM, LINEAR): | 211 | case Hash(TextureFormat::ASTC_2D_10X6, UNORM, LINEAR): |
| 212 | return PixelFormat::ASTC_2D_10X6_UNORM; | 212 | return PixelFormat::ASTC_2D_10X6_UNORM; |
| 213 | case Hash(TextureFormat::ASTC_2D_10X6, UNORM, SRGB): | ||
| 214 | return PixelFormat::ASTC_2D_10X6_SRGB; | ||
| 213 | case Hash(TextureFormat::ASTC_2D_10X5, UNORM, LINEAR): | 215 | case Hash(TextureFormat::ASTC_2D_10X5, UNORM, LINEAR): |
| 214 | return PixelFormat::ASTC_2D_10X5_UNORM; | 216 | return PixelFormat::ASTC_2D_10X5_UNORM; |
| 215 | case Hash(TextureFormat::ASTC_2D_10X5, UNORM, SRGB): | 217 | case Hash(TextureFormat::ASTC_2D_10X5, UNORM, SRGB): |
| @@ -218,6 +220,10 @@ PixelFormat PixelFormatFromTextureInfo(TextureFormat format, ComponentType red, | |||
| 218 | return PixelFormat::ASTC_2D_10X10_UNORM; | 220 | return PixelFormat::ASTC_2D_10X10_UNORM; |
| 219 | case Hash(TextureFormat::ASTC_2D_10X10, UNORM, SRGB): | 221 | case Hash(TextureFormat::ASTC_2D_10X10, UNORM, SRGB): |
| 220 | return PixelFormat::ASTC_2D_10X10_SRGB; | 222 | return PixelFormat::ASTC_2D_10X10_SRGB; |
| 223 | case Hash(TextureFormat::ASTC_2D_12X10, UNORM, LINEAR): | ||
| 224 | return PixelFormat::ASTC_2D_12X10_UNORM; | ||
| 225 | case Hash(TextureFormat::ASTC_2D_12X10, UNORM, SRGB): | ||
| 226 | return PixelFormat::ASTC_2D_12X10_SRGB; | ||
| 221 | case Hash(TextureFormat::ASTC_2D_12X12, UNORM, LINEAR): | 227 | case Hash(TextureFormat::ASTC_2D_12X12, UNORM, LINEAR): |
| 222 | return PixelFormat::ASTC_2D_12X12_UNORM; | 228 | return PixelFormat::ASTC_2D_12X12_UNORM; |
| 223 | case Hash(TextureFormat::ASTC_2D_12X12, UNORM, SRGB): | 229 | 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 | |||
| 179 | return "ASTC_2D_6X6_SRGB"; | 179 | return "ASTC_2D_6X6_SRGB"; |
| 180 | case PixelFormat::ASTC_2D_10X6_UNORM: | 180 | case PixelFormat::ASTC_2D_10X6_UNORM: |
| 181 | return "ASTC_2D_10X6_UNORM"; | 181 | return "ASTC_2D_10X6_UNORM"; |
| 182 | case PixelFormat::ASTC_2D_10X6_SRGB: | ||
| 183 | return "ASTC_2D_10X6_SRGB"; | ||
| 182 | case PixelFormat::ASTC_2D_10X5_UNORM: | 184 | case PixelFormat::ASTC_2D_10X5_UNORM: |
| 183 | return "ASTC_2D_10X5_UNORM"; | 185 | return "ASTC_2D_10X5_UNORM"; |
| 184 | case PixelFormat::ASTC_2D_10X5_SRGB: | 186 | case PixelFormat::ASTC_2D_10X5_SRGB: |
| @@ -187,6 +189,10 @@ struct fmt::formatter<VideoCore::Surface::PixelFormat> : fmt::formatter<fmt::str | |||
| 187 | return "ASTC_2D_10X10_UNORM"; | 189 | return "ASTC_2D_10X10_UNORM"; |
| 188 | case PixelFormat::ASTC_2D_10X10_SRGB: | 190 | case PixelFormat::ASTC_2D_10X10_SRGB: |
| 189 | return "ASTC_2D_10X10_SRGB"; | 191 | return "ASTC_2D_10X10_SRGB"; |
| 192 | case PixelFormat::ASTC_2D_12X10_UNORM: | ||
| 193 | return "ASTC_2D_12X10_UNORM"; | ||
| 194 | case PixelFormat::ASTC_2D_12X10_SRGB: | ||
| 195 | return "ASTC_2D_12X10_SRGB"; | ||
| 190 | case PixelFormat::ASTC_2D_12X12_UNORM: | 196 | case PixelFormat::ASTC_2D_12X12_UNORM: |
| 191 | return "ASTC_2D_12X12_UNORM"; | 197 | return "ASTC_2D_12X12_UNORM"; |
| 192 | case PixelFormat::ASTC_2D_12X12_SRGB: | 198 | 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() { | |||
| 713 | ReadGlobalSetting(Settings::values.shader_backend); | 713 | ReadGlobalSetting(Settings::values.shader_backend); |
| 714 | ReadGlobalSetting(Settings::values.use_asynchronous_shaders); | 714 | ReadGlobalSetting(Settings::values.use_asynchronous_shaders); |
| 715 | ReadGlobalSetting(Settings::values.use_fast_gpu_time); | 715 | ReadGlobalSetting(Settings::values.use_fast_gpu_time); |
| 716 | ReadGlobalSetting(Settings::values.use_pessimistic_flushes); | ||
| 717 | ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); | 716 | ReadGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); |
| 718 | ReadGlobalSetting(Settings::values.bg_red); | 717 | ReadGlobalSetting(Settings::values.bg_red); |
| 719 | ReadGlobalSetting(Settings::values.bg_green); | 718 | ReadGlobalSetting(Settings::values.bg_green); |
| @@ -1359,7 +1358,6 @@ void Config::SaveRendererValues() { | |||
| 1359 | Settings::values.shader_backend.UsingGlobal()); | 1358 | Settings::values.shader_backend.UsingGlobal()); |
| 1360 | WriteGlobalSetting(Settings::values.use_asynchronous_shaders); | 1359 | WriteGlobalSetting(Settings::values.use_asynchronous_shaders); |
| 1361 | WriteGlobalSetting(Settings::values.use_fast_gpu_time); | 1360 | WriteGlobalSetting(Settings::values.use_fast_gpu_time); |
| 1362 | WriteGlobalSetting(Settings::values.use_pessimistic_flushes); | ||
| 1363 | WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); | 1361 | WriteGlobalSetting(Settings::values.use_vulkan_driver_pipeline_cache); |
| 1364 | WriteGlobalSetting(Settings::values.bg_red); | 1362 | WriteGlobalSetting(Settings::values.bg_red); |
| 1365 | WriteGlobalSetting(Settings::values.bg_green); | 1363 | 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() { | |||
| 34 | ui->async_astc->setChecked(Settings::values.async_astc.GetValue()); | 34 | ui->async_astc->setChecked(Settings::values.async_astc.GetValue()); |
| 35 | ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); | 35 | ui->use_asynchronous_shaders->setChecked(Settings::values.use_asynchronous_shaders.GetValue()); |
| 36 | ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); | 36 | ui->use_fast_gpu_time->setChecked(Settings::values.use_fast_gpu_time.GetValue()); |
| 37 | ui->use_pessimistic_flushes->setChecked(Settings::values.use_pessimistic_flushes.GetValue()); | ||
| 38 | ui->use_vulkan_driver_pipeline_cache->setChecked( | 37 | ui->use_vulkan_driver_pipeline_cache->setChecked( |
| 39 | Settings::values.use_vulkan_driver_pipeline_cache.GetValue()); | 38 | Settings::values.use_vulkan_driver_pipeline_cache.GetValue()); |
| 40 | 39 | ||
| @@ -71,8 +70,6 @@ void ConfigureGraphicsAdvanced::ApplyConfiguration() { | |||
| 71 | use_asynchronous_shaders); | 70 | use_asynchronous_shaders); |
| 72 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time, | 71 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_fast_gpu_time, |
| 73 | ui->use_fast_gpu_time, use_fast_gpu_time); | 72 | ui->use_fast_gpu_time, use_fast_gpu_time); |
| 74 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_pessimistic_flushes, | ||
| 75 | ui->use_pessimistic_flushes, use_pessimistic_flushes); | ||
| 76 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache, | 73 | ConfigurationShared::ApplyPerGameSetting(&Settings::values.use_vulkan_driver_pipeline_cache, |
| 77 | ui->use_vulkan_driver_pipeline_cache, | 74 | ui->use_vulkan_driver_pipeline_cache, |
| 78 | use_vulkan_driver_pipeline_cache); | 75 | use_vulkan_driver_pipeline_cache); |
| @@ -102,8 +99,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { | |||
| 102 | ui->use_asynchronous_shaders->setEnabled( | 99 | ui->use_asynchronous_shaders->setEnabled( |
| 103 | Settings::values.use_asynchronous_shaders.UsingGlobal()); | 100 | Settings::values.use_asynchronous_shaders.UsingGlobal()); |
| 104 | ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); | 101 | ui->use_fast_gpu_time->setEnabled(Settings::values.use_fast_gpu_time.UsingGlobal()); |
| 105 | ui->use_pessimistic_flushes->setEnabled( | ||
| 106 | Settings::values.use_pessimistic_flushes.UsingGlobal()); | ||
| 107 | ui->use_vulkan_driver_pipeline_cache->setEnabled( | 102 | ui->use_vulkan_driver_pipeline_cache->setEnabled( |
| 108 | Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal()); | 103 | Settings::values.use_vulkan_driver_pipeline_cache.UsingGlobal()); |
| 109 | ui->anisotropic_filtering_combobox->setEnabled( | 104 | ui->anisotropic_filtering_combobox->setEnabled( |
| @@ -125,9 +120,6 @@ void ConfigureGraphicsAdvanced::SetupPerGameUI() { | |||
| 125 | use_asynchronous_shaders); | 120 | use_asynchronous_shaders); |
| 126 | ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time, | 121 | ConfigurationShared::SetColoredTristate(ui->use_fast_gpu_time, |
| 127 | Settings::values.use_fast_gpu_time, use_fast_gpu_time); | 122 | Settings::values.use_fast_gpu_time, use_fast_gpu_time); |
| 128 | ConfigurationShared::SetColoredTristate(ui->use_pessimistic_flushes, | ||
| 129 | Settings::values.use_pessimistic_flushes, | ||
| 130 | use_pessimistic_flushes); | ||
| 131 | ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache, | 123 | ConfigurationShared::SetColoredTristate(ui->use_vulkan_driver_pipeline_cache, |
| 132 | Settings::values.use_vulkan_driver_pipeline_cache, | 124 | Settings::values.use_vulkan_driver_pipeline_cache, |
| 133 | use_vulkan_driver_pipeline_cache); | 125 | 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: | |||
| 42 | ConfigurationShared::CheckState async_astc; | 42 | ConfigurationShared::CheckState async_astc; |
| 43 | ConfigurationShared::CheckState use_asynchronous_shaders; | 43 | ConfigurationShared::CheckState use_asynchronous_shaders; |
| 44 | ConfigurationShared::CheckState use_fast_gpu_time; | 44 | ConfigurationShared::CheckState use_fast_gpu_time; |
| 45 | ConfigurationShared::CheckState use_pessimistic_flushes; | ||
| 46 | ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache; | 45 | ConfigurationShared::CheckState use_vulkan_driver_pipeline_cache; |
| 47 | 46 | ||
| 48 | const Core::System& system; | 47 | 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 @@ | |||
| 127 | </widget> | 127 | </widget> |
| 128 | </item> | 128 | </item> |
| 129 | <item> | 129 | <item> |
| 130 | <widget class="QCheckBox" name="use_pessimistic_flushes"> | ||
| 131 | <property name="toolTip"> | ||
| 132 | <string>Enables pessimistic buffer flushes. This option will force unmodified buffers to be flushed, which can cost performance.</string> | ||
| 133 | </property> | ||
| 134 | <property name="text"> | ||
| 135 | <string>Use pessimistic buffer flushes (Hack)</string> | ||
| 136 | </property> | ||
| 137 | </widget> | ||
| 138 | </item> | ||
| 139 | <item> | ||
| 140 | <widget class="QCheckBox" name="use_vulkan_driver_pipeline_cache"> | 130 | <widget class="QCheckBox" name="use_vulkan_driver_pipeline_cache"> |
| 141 | <property name="toolTip"> | 131 | <property name="toolTip"> |
| 142 | <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> | 132 | <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() { | |||
| 327 | ReadSetting("Renderer", Settings::values.accelerate_astc); | 327 | ReadSetting("Renderer", Settings::values.accelerate_astc); |
| 328 | ReadSetting("Renderer", Settings::values.async_astc); | 328 | ReadSetting("Renderer", Settings::values.async_astc); |
| 329 | ReadSetting("Renderer", Settings::values.use_fast_gpu_time); | 329 | ReadSetting("Renderer", Settings::values.use_fast_gpu_time); |
| 330 | ReadSetting("Renderer", Settings::values.use_pessimistic_flushes); | ||
| 331 | ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache); | 330 | ReadSetting("Renderer", Settings::values.use_vulkan_driver_pipeline_cache); |
| 332 | 331 | ||
| 333 | ReadSetting("Renderer", Settings::values.bg_red); | 332 | 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 = | |||
| 374 | # 0: Off, 1 (default): On | 374 | # 0: Off, 1 (default): On |
| 375 | use_fast_gpu_time = | 375 | use_fast_gpu_time = |
| 376 | 376 | ||
| 377 | # Force unmodified buffers to be flushed, which can cost performance. | ||
| 378 | # 0: Off (default), 1: On | ||
| 379 | use_pessimistic_flushes = | ||
| 380 | |||
| 381 | # Whether to use garbage collection or not for GPU caches. | 377 | # Whether to use garbage collection or not for GPU caches. |
| 382 | # 0 (default): Off, 1: On | 378 | # 0 (default): Off, 1: On |
| 383 | use_caches_gc = | 379 | use_caches_gc = |