VERY experimental Nintendo Switch 2 emulator
C++
renderer_vulkan: Add more feature checking
GPUCode8a829a12b609
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cppindex 9f316113cc..d600c4e61a 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -309,7 +309,7 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device.support_int16 = device.IsShaderInt16Supported(),.support_int64 = device.IsShaderInt64Supported(),.support_vertex_instance_id = false,- .support_float_controls = true,+ .support_float_controls = device.IsKhrShaderFloatControlsSupported(),.support_separate_denorm_behavior =float_control.denormBehaviorIndependence == VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL,.support_separate_rounding_mode =@@ -325,12 +325,13 @@ PipelineCache::PipelineCache(RasterizerVulkan& rasterizer_, const Device& device.support_fp64_signed_zero_nan_preserve =float_control.shaderSignedZeroInfNanPreserveFloat64 != VK_FALSE,.support_explicit_workgroup_layout = device.IsKhrWorkgroupMemoryExplicitLayoutSupported(),- .support_vote = true,+ .support_vote = device.IsSubgroupFeatureSupported(VK_SUBGROUP_FEATURE_VOTE_BIT),.support_viewport_index_layer_non_geometry =device.IsExtShaderViewportIndexLayerSupported(),.support_viewport_mask = device.IsNvViewportArray2Supported(),.support_typeless_image_loads = device.IsFormatlessImageLoadSupported(),- .support_demote_to_helper_invocation = true,+ .support_demote_to_helper_invocation =+ device.IsExtShaderDemoteToHelperInvocationSupported(),.support_int64_atomics = device.IsExtShaderAtomicInt64Supported(),.support_derivative_control = true,.support_geometry_shader_passthrough = device.IsNvGeometryShaderPassthroughSupported(),diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex 9743a82f5c..70436cf1c5 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -905,6 +905,10 @@ bool Device::GetSuitability(bool requires_swapchain) {properties.driver.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES;SetNext(next, properties.driver);+ // Retrieve subgroup properties.+ properties.subgroup_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES;+ SetNext(next, properties.subgroup_properties);+// Retrieve relevant extension properties.if (extensions.shader_float_controls) {properties.float_controls.sType =diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.hindex 7be6311220..e05d04db32 100644--- a/src/video_core/vulkan_common/vulkan_device.h+++ b/src/video_core/vulkan_common/vulkan_device.h@@ -323,6 +323,11 @@ public:return properties.subgroup_size_control.requiredSubgroupSizeStages & stage;}+ /// Returns true if the device supports the provided subgroup feature.+ bool IsSubgroupFeatureSupported(VkSubgroupFeatureFlagBits feature) const {+ return properties.subgroup_properties.supportedOperations & feature;+ }+/// Returns the maximum number of push descriptors.u32 MaxPushDescriptors() const {return properties.push_descriptor.maxPushDescriptors;@@ -388,6 +393,11 @@ public:return extensions.swapchain_mutable_format;}+ /// Returns true if VK_KHR_shader_float_controls is enabled.+ bool IsKhrShaderFloatControlsSupported() const {+ return extensions.shader_float_controls;+ }+/// Returns true if the device supports VK_KHR_workgroup_memory_explicit_layout.bool IsKhrWorkgroupMemoryExplicitLayoutSupported() const {return extensions.workgroup_memory_explicit_layout;@@ -487,6 +497,11 @@ public:return extensions.shader_stencil_export;}+ /// Returns true if the device supports VK_EXT_shader_demote_to_helper_invocation+ bool IsExtShaderDemoteToHelperInvocationSupported() const {+ return extensions.shader_demote_to_helper_invocation;+ }+/// Returns true if the device supports VK_EXT_conservative_rasterization.bool IsExtConservativeRasterizationSupported() const {return extensions.conservative_rasterization;@@ -684,6 +699,7 @@ private:struct Properties {VkPhysicalDeviceDriverProperties driver{};+ VkPhysicalDeviceSubgroupProperties subgroup_properties{};VkPhysicalDeviceFloatControlsProperties float_controls{};VkPhysicalDevicePushDescriptorPropertiesKHR push_descriptor{};VkPhysicalDeviceSubgroupSizeControlProperties subgroup_size_control{};