VERY experimental Nintendo Switch 2 emulator
C++
[vulkan, qcom] Fix shader float controls on QCOM driver (#4297)
CamilleLaVey60a474b8df05
diff --git a/src/shader_recompiler/backend/spirv/emit_spirv.cpp b/src/shader_recompiler/backend/spirv/emit_spirv.cppindex 53453e6ab7..67329eea0d 100644--- a/src/shader_recompiler/backend/spirv/emit_spirv.cpp+++ b/src/shader_recompiler/backend/spirv/emit_spirv.cpp@@ -335,7 +335,7 @@ void SetupDenormControl(const Profile& profile, const IR::Program& program, Emitif (info.uses_fp32_denorms_flush && info.uses_fp32_denorms_preserve) {LOG_DEBUG(Shader_SPIRV, "Fp32 denorm flush and preserve on the same shader");} else if (info.uses_fp32_denorms_flush) {- if (profile.support_fp32_denorm_flush) {+ if (profile.support_fp32_denorm_flush && !profile.has_broken_fp32_denorm_flush) {ctx.AddCapability(spv::Capability::DenormFlushToZero);ctx.AddExecutionMode(main_func, spv::ExecutionMode::DenormFlushToZero, 32U);} else {diff --git a/src/shader_recompiler/profile.h b/src/shader_recompiler/profile.hindex eb7b2a02b2..eb78683b75 100644--- a/src/shader_recompiler/profile.h+++ b/src/shader_recompiler/profile.h@@ -86,6 +86,8 @@ struct Profile {bool has_broken_signed_operations{};/// Float controls break when fp16 is enabledbool has_broken_fp16_float_controls{};+ /// Declaring fp32 denorm flush to zero miscompiles on some drivers+ bool has_broken_fp32_denorm_flush{};/// Dynamic vec4 indexing is broken on some OpenGL driversbool has_gl_component_indexing_bug{};/// The precise type qualifier is broken in the fragment stage of some driversdiff --git a/src/video_core/renderer_opengl/gl_shader_cache.cpp b/src/video_core/renderer_opengl/gl_shader_cache.cppindex cde03d5822..df69eb97f5 100644--- a/src/video_core/renderer_opengl/gl_shader_cache.cpp+++ b/src/video_core/renderer_opengl/gl_shader_cache.cpp@@ -231,6 +231,7 @@ ShaderCache::ShaderCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,.has_broken_unsigned_image_offsets = true,.has_broken_signed_operations = true,.has_broken_fp16_float_controls = false,+ .has_broken_fp32_denorm_flush = false,.has_gl_component_indexing_bug = device.HasComponentIndexingBug(),.has_gl_precise_bug = device.HasPreciseBug(),.has_gl_cbuf_ftou_bug = device.HasCbufFtouBug(),diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cppindex 785602b33a..41c3877c14 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -444,6 +444,7 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,.has_broken_unsigned_image_offsets = false,.has_broken_signed_operations = false,.has_broken_fp16_float_controls = driver_id == VK_DRIVER_ID_NVIDIA_PROPRIETARY,+ .has_broken_fp32_denorm_flush = driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY,.ignore_nan_fp_comparisons = false,.has_broken_spirv_subgroup_mask_vector_extract_dynamic = false,.has_broken_robust =diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex fc67b96a85..8c18e01f97 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -517,8 +517,6 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHRLOG_WARNING(Render_Vulkan, "Qualcomm drivers have broken color write enable.");RemoveExtensionFeature(extensions.color_write_enable, features.color_write_enable,VK_EXT_COLOR_WRITE_ENABLE_EXTENSION_NAME);- LOG_WARNING(Render_Vulkan, "Qualcomm drivers have broken shader float controls.");- RemoveExtension(extensions.shader_float_controls, VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME);LOG_WARNING(Render_Vulkan, "Qualcomm drivers have broken shader atomic int64.");RemoveExtensionFeature(extensions.shader_atomic_int64, features.shader_atomic_int64,VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME);