VERY experimental Nintendo Switch 2 emulator
C++
video_core: Formalize HasBrokenCompute
lat9nqa74f77bbbc58
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cppindex 18e040a1b1..ee2c33131a 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -705,10 +705,7 @@ std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(std::unique_ptr<ComputePipeline> PipelineCache::CreateComputePipeline(ShaderPools& pools, const ComputePipelineCacheKey& key, Shader::Environment& env,PipelineStatistics* statistics, bool build_in_parallel) try {- // TODO: Remove this when Intel fixes their shader compiler.- // https://github.com/IGCIT/Intel-GPU-Community-Issue-Tracker-IGCIT/issues/159- if (device.GetDriverID() == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS &&- !Settings::values.enable_compute_pipelines.GetValue()) {+ if (device.HasBrokenCompute() && !Settings::values.enable_compute_pipelines.GetValue()) {LOG_ERROR(Render_Vulkan, "Skipping 0x{:016x}", key.Hash());return nullptr;}diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex dcedf4425a..e38e34bc8d 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -562,6 +562,8 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHRLOG_WARNING(Render_Vulkan, "Intel proprietary drivers do not support MSAA image blits");cant_blit_msaa = true;}+ has_broken_compute =+ CheckBrokenCompute(properties.driver.driverID, properties.properties.driverVersion);if (is_intel_anv || (is_qualcomm && !is_s8gen2)) {LOG_WARNING(Render_Vulkan, "Driver does not support native BGR format");must_emulate_bgr565 = true;diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.hindex 8c7e44fcbe..e548280887 100644--- a/src/video_core/vulkan_common/vulkan_device.h+++ b/src/video_core/vulkan_common/vulkan_device.h@@ -10,6 +10,7 @@#include <vector>#include "common/common_types.h"+#include "common/logging/log.h"#include "common/settings.h"#include "video_core/vulkan_common/vulkan_wrapper.h"@@ -518,6 +519,11 @@ public:return has_renderdoc || has_nsight_graphics || Settings::values.renderer_debug.GetValue();}+ /// @returns True if compute pipelines can cause crashing.+ bool HasBrokenCompute() const {+ return has_broken_compute;+ }+/// Returns true when the device does not properly support cube compatibility.bool HasBrokenCubeImageCompability() const {return has_broken_cube_compatibility;@@ -579,6 +585,22 @@ public:return supports_conditional_barriers;}+ [[nodiscard]] static constexpr bool CheckBrokenCompute(VkDriverId driver_id,+ u32 driver_version) {+ if (driver_id == VK_DRIVER_ID_INTEL_PROPRIETARY_WINDOWS) {+ const u32 major = VK_API_VERSION_MAJOR(driver_version);+ const u32 minor = VK_API_VERSION_MINOR(driver_version);+ const u32 patch = VK_API_VERSION_PATCH(driver_version);+ if (major == 0 && minor == 405 && patch < 286) {+ LOG_WARNING(+ Render_Vulkan,+ "Intel proprietary drivers 0.405.0 until 0.405.286 have broken compute");+ return true;+ }+ }+ return {};+ }+private:/// Checks if the physical device is suitable and configures the object state/// with all necessary info about its properties.@@ -672,6 +694,7 @@ private:bool is_integrated{}; ///< Is GPU an iGPU.bool is_virtual{}; ///< Is GPU a virtual GPU.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 bitbool has_renderdoc{}; ///< Has RenderDoc attachedbool has_nsight_graphics{}; ///< Has Nsight Graphics attached