diff options
| author | 2021-07-20 03:08:06 -0300 | |
|---|---|---|
| committer | 2021-07-22 21:51:40 -0400 | |
| commit | 3c6d440015d7ffb81eedbfcd7ee1aab1ea87ee2a (patch) | |
| tree | e479814ce9cfb14a51c1cf404659f32f0ff61a46 | |
| parent | opengl: Fix asynchronous shaders (diff) | |
| download | yuzu-3c6d440015d7ffb81eedbfcd7ee1aab1ea87ee2a.tar.gz yuzu-3c6d440015d7ffb81eedbfcd7ee1aab1ea87ee2a.tar.xz yuzu-3c6d440015d7ffb81eedbfcd7ee1aab1ea87ee2a.zip | |
Revert "renderers: Disable async shader compilation"
This reverts commit 4a152767286717fa69bfc94846a124a366f70065.
Diffstat (limited to '')
| -rw-r--r-- | src/video_core/renderer_opengl/gl_device.cpp | 6 | ||||
| -rw-r--r-- | src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/video_core/renderer_opengl/gl_device.cpp b/src/video_core/renderer_opengl/gl_device.cpp index 6afe6c1e1..9692b8e94 100644 --- a/src/video_core/renderer_opengl/gl_device.cpp +++ b/src/video_core/renderer_opengl/gl_device.cpp | |||
| @@ -180,11 +180,9 @@ Device::Device() { | |||
| 180 | LOG_ERROR(Render_OpenGL, "Assembly shaders enabled but not supported"); | 180 | LOG_ERROR(Render_OpenGL, "Assembly shaders enabled but not supported"); |
| 181 | shader_backend = Settings::ShaderBackend::GLSL; | 181 | shader_backend = Settings::ShaderBackend::GLSL; |
| 182 | } | 182 | } |
| 183 | // Completely disable async shaders for now, as it causes graphical glitches | ||
| 184 | use_asynchronous_shaders = false; | ||
| 185 | // Blocks AMD and Intel OpenGL drivers on Windows from using asynchronous shader compilation. | 183 | // Blocks AMD and Intel OpenGL drivers on Windows from using asynchronous shader compilation. |
| 186 | // use_asynchronous_shaders = Settings::values.use_asynchronous_shaders.GetValue() && | 184 | use_asynchronous_shaders = Settings::values.use_asynchronous_shaders.GetValue() && |
| 187 | // !(is_amd || (is_intel && !is_linux)); | 185 | !(is_amd || (is_intel && !is_linux)); |
| 188 | use_driver_cache = is_nvidia; | 186 | use_driver_cache = is_nvidia; |
| 189 | 187 | ||
| 190 | LOG_INFO(Render_OpenGL, "Renderer_VariableAOFFI: {}", has_variable_aoffi); | 188 | LOG_INFO(Render_OpenGL, "Renderer_VariableAOFFI: {}", has_variable_aoffi); |
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 2ce8b4156..57b163247 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp | |||
| @@ -271,7 +271,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, Tegra::Engines::Maxw | |||
| 271 | device{device_}, scheduler{scheduler_}, descriptor_pool{descriptor_pool_}, | 271 | device{device_}, scheduler{scheduler_}, descriptor_pool{descriptor_pool_}, |
| 272 | update_descriptor_queue{update_descriptor_queue_}, render_pass_cache{render_pass_cache_}, | 272 | update_descriptor_queue{update_descriptor_queue_}, render_pass_cache{render_pass_cache_}, |
| 273 | buffer_cache{buffer_cache_}, texture_cache{texture_cache_}, shader_notify{shader_notify_}, | 273 | buffer_cache{buffer_cache_}, texture_cache{texture_cache_}, shader_notify{shader_notify_}, |
| 274 | use_asynchronous_shaders{false}, | 274 | use_asynchronous_shaders{Settings::values.use_asynchronous_shaders.GetValue()}, |
| 275 | workers(std::max(std::thread::hardware_concurrency(), 2U) - 1, "yuzu:PipelineBuilder"), | 275 | workers(std::max(std::thread::hardware_concurrency(), 2U) - 1, "yuzu:PipelineBuilder"), |
| 276 | serialization_thread(1, "yuzu:PipelineSerialization") { | 276 | serialization_thread(1, "yuzu:PipelineSerialization") { |
| 277 | const auto& float_control{device.FloatControlProperties()}; | 277 | const auto& float_control{device.FloatControlProperties()}; |