VERY experimental Nintendo Switch 2 emulator
C++
Vulkan: Be more generous with pipeline workers for Android
Fernando Sahmkowc6330ca05fd9
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cppindex 22bf8cc778..16ad8d6252 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -263,6 +263,22 @@ Shader::RuntimeInfo MakeRuntimeInfo(std::span<const Shader::IR::Program> programinfo.y_negate = key.state.y_negate != 0;return info;}++size_t GetTotalPipelineWorkers() {+ const size_t max_core_threads =+ std::max<size_t>(static_cast<size_t>(std::thread::hardware_concurrency()), 2ULL) - 1ULL;+#ifdef ANDROID+ // Leave at least a few cores free in android+ constexpr size_t free_cores = 3ULL;+ if (max_core_threads <= free_cores) {+ return 1ULL;+ }+ return max_core_threads - free_cores;+#else+ return max_core_threads;+#endif+}+} // Anonymous namespacesize_t ComputePipelineCacheKey::Hash() const noexcept {@@ -294,11 +310,8 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& devicetexture_cache{texture_cache_}, shader_notify{shader_notify_},use_asynchronous_shaders{Settings::values.use_asynchronous_shaders.GetValue()},use_vulkan_pipeline_cache{Settings::values.use_vulkan_driver_pipeline_cache.GetValue()},-#ifdef ANDROID- workers(1, "VkPipelineBuilder"),-#else- workers(std::max(std::thread::hardware_concurrency(), 2U) - 1, "VkPipelineBuilder"),-#endif+ workers(device.HasBrokenParallelShaderCompiling() ? 1ULL : GetTotalPipelineWorkers(),+ "VkPipelineBuilder"),serialization_thread(1, "VkPipelineSerialization") {const auto& float_control{device.FloatControlProperties()};const VkDriverId driver_id{device.GetDriverID()};diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex e518756d23..6900b8ffaf 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -635,6 +635,12 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHRhas_broken_cube_compatibility = true;}}+ if (is_qualcomm) {+ const u32 version = (properties.properties.driverVersion << 3) >> 3;+ if (version < VK_MAKE_API_VERSION(0, 255, 615, 512)) {+ has_broken_parallel_compiling = true;+ }+ }if (extensions.sampler_filter_minmax && is_amd) {// Disable ext_sampler_filter_minmax on AMD GCN4 and lower as it is broken.if (!features.shader_float16_int8.shaderFloat16) {diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.hindex b213ed7dd3..355de06169 100644--- a/src/video_core/vulkan_common/vulkan_device.h+++ b/src/video_core/vulkan_common/vulkan_device.h@@ -102,6 +102,7 @@ VK_DEFINE_HANDLE(VmaAllocator)EXTENSION_NAME(VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME) \EXTENSION_NAME(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME) \EXTENSION_NAME(VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME) \+ EXTENSION_NAME(VK_EXT_EXTERNAL_MEMORY_HOST_EXTENSION_NAME) \EXTENSION_NAME(VK_EXT_4444_FORMATS_EXTENSION_NAME) \EXTENSION_NAME(VK_EXT_LINE_RASTERIZATION_EXTENSION_NAME) \EXTENSION_NAME(VK_EXT_ROBUSTNESS_2_EXTENSION_NAME) \@@ -599,6 +600,11 @@ public:return has_broken_cube_compatibility;}+ /// Returns true if parallel shader compiling has issues with the current driver.+ bool HasBrokenParallelShaderCompiling() const {+ return has_broken_parallel_compiling;+ }+/// Returns the vendor name reported from Vulkan.std::string_view GetVendorName() const {return properties.driver.driverName;@@ -794,6 +800,7 @@ private:bool is_non_gpu{}; ///< Is SoftwareRasterizer, FPGA, non-GPU device.bool has_broken_compute{}; ///< Compute shaders can cause crashesbool has_broken_cube_compatibility{}; ///< Has broken cube compatibility bit+ bool has_broken_parallel_compiling{}; ///< Has broken parallel shader compiling.bool has_renderdoc{}; ///< Has RenderDoc attachedbool has_nsight_graphics{}; ///< Has Nsight Graphics attachedbool supports_d24_depth{}; ///< Supports D24 depth buffers.