From 8bf4acad80a12e6e5f5cab6844c53f097b34388c Mon Sep 17 00:00:00 2001 From: JPikachu Date: Mon, 5 May 2025 01:30:35 +0100 Subject: [PATCH 1/7] vulkan: Remove checks disabling vertex_input_dynamic_state --- src/video_core/vulkan_common/vulkan_device.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index dc7223227a..dc685eb5e2 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -641,9 +641,9 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR const u32 version = (properties.properties.driverVersion << 3) >> 3; if (version < VK_MAKE_API_VERSION(27, 20, 100, 0)) { LOG_WARNING(Render_Vulkan, "Intel has broken VK_EXT_vertex_input_dynamic_state"); - RemoveExtensionFeature(extensions.vertex_input_dynamic_state, - features.vertex_input_dynamic_state, - VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); + //RemoveExtensionFeature(extensions.vertex_input_dynamic_state, + //features.vertex_input_dynamic_state, + //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); } } if (features.shader_float16_int8.shaderFloat16 && is_intel_windows) { @@ -725,8 +725,8 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR RemoveExtensionFeature(extensions.extended_dynamic_state2, features.extended_dynamic_state2, VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); - RemoveExtensionFeature(extensions.vertex_input_dynamic_state, features.vertex_input_dynamic_state, - VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); + //RemoveExtensionFeature(extensions.vertex_input_dynamic_state, features.vertex_input_dynamic_state, + //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); // Disable extended dynamic state 3 features features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; @@ -1247,9 +1247,9 @@ void Device::RemoveUnsuitableExtensions() { // VK_EXT_vertex_input_dynamic_state extensions.vertex_input_dynamic_state = features.vertex_input_dynamic_state.vertexInputDynamicState; - RemoveExtensionFeatureIfUnsuitable(extensions.vertex_input_dynamic_state, - features.vertex_input_dynamic_state, - VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); + //RemoveExtensionFeatureIfUnsuitable(extensions.vertex_input_dynamic_state, + //features.vertex_input_dynamic_state, + //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); // VK_KHR_pipeline_executable_properties if (Settings::values.renderer_shader_feedback.GetValue()) { From e0d96535c3ef19e8562349b280356dfc264cd123 Mon Sep 17 00:00:00 2001 From: JPikachu Date: Mon, 5 May 2025 11:54:24 +0100 Subject: [PATCH 2/7] vulkan: Disable VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT --- src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index 2765a44f3c..afdac0f0d6 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -803,7 +803,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { static constexpr std::array extended{ VK_DYNAMIC_STATE_CULL_MODE_EXT, VK_DYNAMIC_STATE_FRONT_FACE_EXT, - VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT, + //VK_DYNAMIC_STATE_VERTEX_INPUT_BINDING_STRIDE_EXT, //Disabled for VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME VK_DYNAMIC_STATE_DEPTH_TEST_ENABLE_EXT, VK_DYNAMIC_STATE_DEPTH_WRITE_ENABLE_EXT, VK_DYNAMIC_STATE_DEPTH_COMPARE_OP_EXT, From 293a1ba8deabd96ec432424e7a3e3c2b9ceb41da Mon Sep 17 00:00:00 2001 From: JPikachu Date: Sun, 4 May 2025 22:45:56 +0100 Subject: [PATCH 3/7] vulkan: Remove checks disabling push_descriptor Removed explicit calls to `RemoveExtension` that disabled the VK_KHR_push_descriptor extension for specific hardware/driver combinations (Qualcomm, older NVIDIA, specific Intel ANV versions). --- src/video_core/vulkan_common/vulkan_device.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index dc685eb5e2..0f66668786 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -490,7 +490,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR if (is_qualcomm) { LOG_WARNING(Render_Vulkan, "Qualcomm drivers have a slow VK_KHR_push_descriptor implementation"); - RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); + //RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); #if defined(ANDROID) && defined(ARCHITECTURE_arm64) // Patch the driver to enable BCn textures. @@ -524,7 +524,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR } else if (arch <= NvidiaArchitecture::Arch_Volta) { if (nv_major_version < 527) { LOG_WARNING(Render_Vulkan, "Volta and older have broken VK_KHR_push_descriptor"); - RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); + //RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); } } if (nv_major_version >= 510) { @@ -670,14 +670,14 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR // mesa/mesa/-/commit/ff91c5ca42bc80aa411cb3fd8f550aa6fdd16bdc LOG_WARNING(Render_Vulkan, "ANV drivers 22.3.0 to 23.1.0 have broken VK_KHR_push_descriptor"); - RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); + //RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); } } else if (extensions.push_descriptor && is_nvidia) { const auto arch = GetNvidiaArch(); if (arch <= NvidiaArchitecture::Arch_Pascal) { LOG_WARNING(Render_Vulkan, "Pascal and older architectures have broken VK_KHR_push_descriptor"); - RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); + //RemoveExtension(extensions.push_descriptor, VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME); } } From 860d8ab74164ba4ec7ab3f02275788b99e89a0ab Mon Sep 17 00:00:00 2001 From: JPikachu Date: Tue, 6 May 2025 19:40:23 +0100 Subject: [PATCH 4/7] vulkan: Enable and log Vulkan 1.4 feature support - Chain VkPhysicalDeviceVulkan13/14Features into device creation - Query and enable features via vkGetPhysicalDeviceFeatures2 - Log Vulkan 1.4 dynamicPrimitiveTopologyUnrestricted at runtime --- .../vulkan_common/vulkan_device.cpp | 35 ++++++++++++++----- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 0f66668786..c26168c47d 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -313,18 +313,18 @@ void OverrideBcnFormats(std::unordered_map& format #endif NvidiaArchitecture GetNvidiaArchitecture(vk::PhysicalDevice physical, - const std::set>& exts) { + const std::set>& exts) { + VkPhysicalDeviceProperties2 physical_properties{}; + physical_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; + physical_properties.pNext = nullptr; + if (exts.contains(VK_KHR_FRAGMENT_SHADING_RATE_EXTENSION_NAME)) { VkPhysicalDeviceFragmentShadingRatePropertiesKHR shading_rate_props{}; shading_rate_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_PROPERTIES_KHR; - VkPhysicalDeviceProperties2 physical_properties{}; - physical_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; physical_properties.pNext = &shading_rate_props; physical.GetProperties2(physical_properties); if (shading_rate_props.primitiveFragmentShadingRateWithMultipleViewports) { - // Only Ampere and newer support this feature - // TODO: Find a way to differentiate Ampere and Ada return NvidiaArchitecture::Arch_AmpereOrNewer; } return NvidiaArchitecture::Arch_Turing; @@ -334,8 +334,6 @@ NvidiaArchitecture GetNvidiaArchitecture(vk::PhysicalDevice physical, VkPhysicalDeviceBlendOperationAdvancedPropertiesEXT advanced_blending_props{}; advanced_blending_props.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BLEND_OPERATION_ADVANCED_PROPERTIES_EXT; - VkPhysicalDeviceProperties2 physical_properties{}; - physical_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; physical_properties.pNext = &advanced_blending_props; physical.GetProperties2(physical_properties); if (advanced_blending_props.advancedBlendMaxColorAttachments == 1) { @@ -1036,6 +1034,15 @@ bool Device::GetSuitability(bool requires_swapchain) { // Set next pointer. void** next = &features2.pNext; + // Vulkan 1.3 and 1.4 features + features_1_3.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES; + features_1_4.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES; + + // Chain: 1.4 -> 1.3 -> features2 + features_1_3.pNext = &features_1_4; + *next = &features_1_3; + next = &features_1_4.pNext; + // Test all features we know about. If the feature is not available in core at our // current API version, and was not enabled by an extension, skip testing the feature. // We set the structure sType explicitly here as it is zeroed by the constructor. @@ -1068,6 +1075,10 @@ bool Device::GetSuitability(bool requires_swapchain) { // Perform the feature test. physical.GetFeatures2(features2); + + LOG_INFO(Render_Vulkan, "Vulkan 1.4 feature enabled: dynamicPrimitiveTopologyUnrestricted = {}", + features_1_4.dynamicPrimitiveTopologyUnrestricted); + features.features = features2.features; // Some features are mandatory. Check those. @@ -1124,8 +1135,16 @@ bool Device::GetSuitability(bool requires_swapchain) { SetNext(next, properties.transform_feedback); } - // Perform the property fetch. + VkPhysicalDeviceVulkan14Properties properties_1_4{}; + properties_1_4.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES; + properties_1_4.pNext = nullptr; // No further chaining + + properties2.pNext = &properties_1_4; // Chain 1.4 props into the top-level struct + + // Perform the property fetch. physical.GetProperties2(properties2); + + // Store base properties properties.properties = properties2.properties; // Unload extensions if feature support is insufficient. From 7938031bcca40f9c0793bab2ccf56ad66fa59add Mon Sep 17 00:00:00 2001 From: JPikachu Date: Tue, 6 May 2025 23:34:51 +0100 Subject: [PATCH 5/7] Fully enable --- .../vulkan_common/vulkan_device.cpp | 38 +++++++++++++------ 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index c26168c47d..1812df4ab0 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -961,6 +961,9 @@ bool Device::GetSuitability(bool requires_swapchain) { // Assume we will be suitable. bool suitable = true; + VkPhysicalDeviceVulkan13Features features_1_3{}; + VkPhysicalDeviceVulkan14Features features_1_4{}; + // Configure properties. properties.properties = physical.GetProperties(); @@ -1035,13 +1038,14 @@ bool Device::GetSuitability(bool requires_swapchain) { void** next = &features2.pNext; // Vulkan 1.3 and 1.4 features - features_1_3.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES; - features_1_4.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES; + if (instance_version >= VK_API_VERSION_1_3) { + features_1_3.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES; + features_1_4.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES; - // Chain: 1.4 -> 1.3 -> features2 - features_1_3.pNext = &features_1_4; - *next = &features_1_3; - next = &features_1_4.pNext; + features_1_3.pNext = &features_1_4; + *next = &features_1_3; + next = &features_1_4.pNext; + } // Test all features we know about. If the feature is not available in core at our // current API version, and was not enabled by an extension, skip testing the feature. @@ -1076,9 +1080,12 @@ bool Device::GetSuitability(bool requires_swapchain) { // Perform the feature test. physical.GetFeatures2(features2); - LOG_INFO(Render_Vulkan, "Vulkan 1.4 feature enabled: dynamicPrimitiveTopologyUnrestricted = {}", - features_1_4.dynamicPrimitiveTopologyUnrestricted); + if (instance_version >= VK_API_VERSION_1_4) { + LOG_INFO(Render_Vulkan, "Vulkan 1.4 feature enabled: dynamicPrimitiveTopologyUnrestricted = {}", + features_1_4.dynamicPrimitiveTopologyUnrestricted); + } + // Base Vulkan 1.0 features are always valid regardless of instance version. features.features = features2.features; // Some features are mandatory. Check those. @@ -1137,15 +1144,24 @@ bool Device::GetSuitability(bool requires_swapchain) { VkPhysicalDeviceVulkan14Properties properties_1_4{}; properties_1_4.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES; - properties_1_4.pNext = nullptr; // No further chaining + properties_1_4.pNext = nullptr; - properties2.pNext = &properties_1_4; // Chain 1.4 props into the top-level struct + if (instance_version >= VK_API_VERSION_1_4) { + properties2.pNext = &properties_1_4; + } else { + properties2.pNext = nullptr; + } // Perform the property fetch. physical.GetProperties2(properties2); + + if (instance_version >= VK_API_VERSION_1_4) { + LOG_INFO(Render_Vulkan, "Vulkan 1.4 property maxSynchronization2Semaphores = {}", + properties_1_4.maxSynchronization2Semaphores); + } // Store base properties - properties.properties = properties2.properties; + properties.properties = properties2.properties; // Unload extensions if feature support is insufficient. RemoveUnsuitableExtensions(); From 318aeebdf371aaf690f828b4dbe28091dd0dfe32 Mon Sep 17 00:00:00 2001 From: swurl Date: Thu, 8 May 2025 18:14:48 -0400 Subject: [PATCH 6/7] descriptor_indexing, VIDS, provoking_vertex Signed-off-by: swurl --- src/common/settings.h | 6 +- .../renderer_vulkan/pipeline_helper.h | 1 + .../renderer_vulkan/vk_graphics_pipeline.cpp | 7 +- .../renderer_vulkan/vk_pipeline_cache.cpp | 9 +- .../vulkan_common/vulkan_device.cpp | 148 +++++++++--------- src/video_core/vulkan_common/vulkan_device.h | 8 +- .../configure_graphics_extensions.cpp | 13 ++ src/yuzu/configuration/shared_translation.cpp | 13 ++ 8 files changed, 124 insertions(+), 81 deletions(-) diff --git a/src/common/settings.h b/src/common/settings.h index 47dc65afa8..6eda1caa08 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -446,11 +446,15 @@ struct Values { SwitchableSetting dyna_state{linkage, 1, 0, - 3, + 2, "dyna_state", Category::RendererExtensions, Specialization::Scalar}; + SwitchableSetting dyna_state3{linkage, false, "dyna_state3", Category::RendererExtensions}; + SwitchableSetting provoking_vertex{linkage, false, "provoking_vertex", Category::RendererExtensions}; + SwitchableSetting descriptor_indexing{linkage, false, "descriptor_indexing", Category::RendererExtensions}; + Setting renderer_debug{linkage, false, "debug", Category::RendererDebug}; Setting renderer_shader_feedback{linkage, false, "shader_feedback", Category::RendererDebug}; diff --git a/src/video_core/renderer_vulkan/pipeline_helper.h b/src/video_core/renderer_vulkan/pipeline_helper.h index 850c34a3a7..910e07a606 100644 --- a/src/video_core/renderer_vulkan/pipeline_helper.h +++ b/src/video_core/renderer_vulkan/pipeline_helper.h @@ -28,6 +28,7 @@ public: num_descriptors <= device->MaxPushDescriptors(); } + // TODO(crueter): utilize layout binding flags vk::DescriptorSetLayout CreateDescriptorSetLayout(bool use_push_descriptor) const { if (bindings.empty()) { return nullptr; diff --git a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp index afdac0f0d6..4b4331d2f4 100644 --- a/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp +++ b/src/video_core/renderer_vulkan/vk_graphics_pipeline.cpp @@ -235,6 +235,7 @@ ConfigureFuncPtr ConfigureFunc(const std::array& m } } // Anonymous namespace +// TODO(crueter): This is the worst-formatted code I have EVER seen GraphicsPipeline::GraphicsPipeline( Scheduler& scheduler_, BufferCache& buffer_cache_, TextureCache& texture_cache_, vk::PipelineCache& pipeline_cache_, VideoCore::ShaderNotify* shader_notify, @@ -263,9 +264,11 @@ GraphicsPipeline::GraphicsPipeline( DescriptorLayoutBuilder builder{MakeBuilder(device, stage_infos)}; uses_push_descriptor = builder.CanUsePushDescriptor(); descriptor_set_layout = builder.CreateDescriptorSetLayout(uses_push_descriptor); + if (!uses_push_descriptor) { descriptor_allocator = descriptor_pool.Allocator(*descriptor_set_layout, stage_infos); } + const VkDescriptorSetLayout set_layout{*descriptor_set_layout}; pipeline_layout = builder.CreatePipelineLayout(set_layout); descriptor_update_template = @@ -716,13 +719,14 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { ? VK_PROVOKING_VERTEX_MODE_LAST_VERTEX_EXT : VK_PROVOKING_VERTEX_MODE_FIRST_VERTEX_EXT, }; + if (IsLine(input_assembly_topology) && device.IsExtLineRasterizationSupported()) { line_state.pNext = std::exchange(rasterization_ci.pNext, &line_state); } if (device.IsExtConservativeRasterizationSupported()) { conservative_raster.pNext = std::exchange(rasterization_ci.pNext, &conservative_raster); } - if (device.IsExtProvokingVertexSupported()) { + if (device.IsExtProvokingVertexSupported() && Settings::values.provoking_vertex.GetValue()) { provoking_vertex.pNext = std::exchange(rasterization_ci.pNext, &provoking_vertex); } @@ -897,6 +901,7 @@ void GraphicsPipeline::MakePipeline(VkRenderPass render_pass) { if (device.IsKhrPipelineExecutablePropertiesEnabled()) { flags |= VK_PIPELINE_CREATE_CAPTURE_STATISTICS_BIT_KHR; } + pipeline = device.GetLogical().CreateGraphicsPipeline( { .sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO, diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index 62578cf306..27efc02e69 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -403,20 +403,23 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_, } const u8 dynamic_state = Settings::values.dyna_state.GetValue(); + const bool dynamic_state3 = dynamic_state == 2 && Settings::values.dyna_state3.GetValue(); LOG_INFO(Render_Vulkan, "DynamicState value is set to {}", (u32) dynamic_state); + LOG_INFO(Render_Vulkan, "DynamicState3 value is set to {}", dynamic_state3); dynamic_features = DynamicFeatures{ .has_extended_dynamic_state = device.IsExtExtendedDynamicStateSupported() && dynamic_state > 0, .has_extended_dynamic_state_2 = device.IsExtExtendedDynamicState2Supported() && dynamic_state > 1, .has_extended_dynamic_state_2_extra = device.IsExtExtendedDynamicState2ExtrasSupported() && dynamic_state > 1, - .has_extended_dynamic_state_3_blend = device.IsExtExtendedDynamicState3BlendingSupported() && dynamic_state > 2, - .has_extended_dynamic_state_3_enables = device.IsExtExtendedDynamicState3EnablesSupported() && dynamic_state > 2, - .has_dynamic_vertex_input = device.IsExtVertexInputDynamicStateSupported(), + .has_extended_dynamic_state_3_blend = device.IsExtExtendedDynamicState3BlendingSupported() && dynamic_state3, + .has_extended_dynamic_state_3_enables = device.IsExtExtendedDynamicState3EnablesSupported() && dynamic_state3, + .has_dynamic_vertex_input = device.IsExtVertexInputDynamicStateSupported(),// && dynamic_state3, }; LOG_INFO(Render_Vulkan, "DynamicState1: {}", dynamic_features.has_extended_dynamic_state); LOG_INFO(Render_Vulkan, "DynamicState2: {}", dynamic_features.has_extended_dynamic_state_2); LOG_INFO(Render_Vulkan, "DynamicState3: {}", dynamic_features.has_extended_dynamic_state_3_enables); + LOG_INFO(Render_Vulkan, "DynamicVertexInput: {}", dynamic_features.has_dynamic_vertex_input); } PipelineCache::~PipelineCache() { diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 1812df4ab0..283820422e 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -386,11 +386,11 @@ void Device::RemoveExtensionFeature(bool& extension, Feature& feature, // Unload extension. this->RemoveExtension(extension, extension_name); - // Save sType and pNext for chain. + // Save sType and pNext for chain. VkStructureType sType = feature.sType; void* pNext = feature.pNext; - // Clear feature struct and restore chain. + // Clear feature struct and restore chain. feature = {}; feature.sType = sType; feature.pNext = pNext; @@ -408,7 +408,7 @@ void Device::RemoveExtensionFeatureIfUnsuitable(bool is_suitable, Feature& featu Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR surface, const vk::InstanceDispatch& dld_) : instance{instance_}, dld{dld_}, physical{physical_}, - format_properties(GetFormatProperties(physical)) { + format_properties(GetFormatProperties(physical)) { // Get suitability and device properties. const bool is_suitable = GetSuitability(surface != nullptr); @@ -440,12 +440,13 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR SetupFamilies(surface); const auto queue_cis = GetDeviceQueueCreateInfos(); - // GetSuitability has already configured the linked list of features for us. - // Reuse it here. + // GetSuitability has already configured the linked list of features for us. + // Reuse it here. const void* first_next = &features2; VkDeviceDiagnosticsConfigCreateInfoNV diagnostics_nv{}; - if (Settings::values.enable_nsight_aftermath && extensions.device_diagnostics_config) { + const bool use_diagnostics_nv = Settings::values.enable_nsight_aftermath && extensions.device_diagnostics_config; + if (use_diagnostics_nv) { nsight_aftermath_tracker = std::make_unique(); diagnostics_nv = { @@ -458,6 +459,18 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR first_next = &diagnostics_nv; } + VkPhysicalDeviceDescriptorIndexingFeaturesEXT descriptor_indexing{ + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES_EXT, + .pNext = use_diagnostics_nv ? static_cast(&diagnostics_nv) : static_cast(&features2), + .shaderSampledImageArrayNonUniformIndexing = VK_TRUE, + .descriptorBindingPartiallyBound = VK_TRUE, + .descriptorBindingVariableDescriptorCount = VK_TRUE, + }; + + if (extensions.descriptor_indexing && Settings::values.descriptor_indexing.GetValue()) { + first_next = &descriptor_indexing; + } + is_blit_depth24_stencil8_supported = TestDepthStencilBlits(VK_FORMAT_D24_UNORM_S8_UINT); is_blit_depth32_stencil8_supported = TestDepthStencilBlits(VK_FORMAT_D32_SFLOAT_S8_UINT); is_optimal_astc_supported = ComputeIsOptimalAstcSupported(); @@ -640,8 +653,8 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR if (version < VK_MAKE_API_VERSION(27, 20, 100, 0)) { LOG_WARNING(Render_Vulkan, "Intel has broken VK_EXT_vertex_input_dynamic_state"); //RemoveExtensionFeature(extensions.vertex_input_dynamic_state, - //features.vertex_input_dynamic_state, - //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); + //features.vertex_input_dynamic_state, + //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); } } if (features.shader_float16_int8.shaderFloat16 && is_intel_windows) { @@ -724,7 +737,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); //RemoveExtensionFeature(extensions.vertex_input_dynamic_state, features.vertex_input_dynamic_state, - //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); + //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); // Disable extended dynamic state 3 features features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = false; @@ -797,7 +810,7 @@ VkFormat Device::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFlags return alternative; } - // No alternatives found, panic + // No alternatives found, panic LOG_ERROR(Render_Vulkan, "Format={} with usage={} and type={} is not supported by the host hardware and " "doesn't support any of the alternatives", @@ -808,7 +821,7 @@ VkFormat Device::GetSupportedFormat(VkFormat wanted_format, VkFormatFeatureFlags void Device::ReportLoss() const { LOG_CRITICAL(Render_Vulkan, "Device loss occurred!"); - // Wait for the log to flush and for Nsight Aftermath to dump the results + // Wait for the log to flush and for Nsight Aftermath to dump the results std::this_thread::sleep_for(std::chrono::seconds{15}); } @@ -961,28 +974,30 @@ bool Device::GetSuitability(bool requires_swapchain) { // Assume we will be suitable. bool suitable = true; + // Configure properties. + VkPhysicalDeviceVulkan12Features features_1_2{}; VkPhysicalDeviceVulkan13Features features_1_3{}; VkPhysicalDeviceVulkan14Features features_1_4{}; - // Configure properties. + // Configure properties. properties.properties = physical.GetProperties(); - // Set instance version. + // Set instance version. instance_version = properties.properties.apiVersion; - // Minimum of API version 1.1 is required. (This is well-supported.) + // Minimum of API version 1.1 is required. (This is well-supported.) ASSERT(instance_version >= VK_API_VERSION_1_1); - // Get available extensions. + // Get available extensions. auto extension_properties = physical.EnumerateDeviceExtensionProperties(); - // Get the set of supported extensions. + // Get the set of supported extensions. supported_extensions.clear(); for (const VkExtensionProperties& property : extension_properties) { supported_extensions.insert(property.extensionName); } - // Generate list of extensions to load. + // Generate list of extensions to load. loaded_extensions.clear(); #define EXTENSION(prefix, macro_name, var_name) \ @@ -1009,7 +1024,7 @@ bool Device::GetSuitability(bool requires_swapchain) { #undef FEATURE_EXTENSION #undef EXTENSION - // Some extensions are mandatory. Check those. +// Some extensions are mandatory. Check those. #define CHECK_EXTENSION(extension_name) \ if (!loaded_extensions.contains(extension_name)) { \ LOG_ERROR(Render_Vulkan, "Missing required extension {}", extension_name); \ @@ -1031,25 +1046,28 @@ bool Device::GetSuitability(bool requires_swapchain) { #undef LOG_EXTENSION #undef CHECK_EXTENSION - // Generate the linked list of features to test. + // Generate the linked list of features to test. features2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2; - // Set next pointer. + // Set next pointer. void** next = &features2.pNext; - // Vulkan 1.3 and 1.4 features - if (instance_version >= VK_API_VERSION_1_3) { + // Vulkan 1.2, 1.3 and 1.4 features + if (instance_version >= VK_API_VERSION_1_2) { + features_1_2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES; features_1_3.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_3_FEATURES; features_1_4.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_FEATURES; + features_1_2.pNext = &features_1_3; features_1_3.pNext = &features_1_4; - *next = &features_1_3; - next = &features_1_4.pNext; + + *next = &features_1_2; + // next = &features_1_4.pNext; } - // Test all features we know about. If the feature is not available in core at our - // current API version, and was not enabled by an extension, skip testing the feature. - // We set the structure sType explicitly here as it is zeroed by the constructor. +// Test all features we know about. If the feature is not available in core at our +// current API version, and was not enabled by an extension, skip testing the feature. +// We set the structure sType explicitly here as it is zeroed by the constructor. #define FEATURE(prefix, struct_name, macro_name, var_name) \ features.var_name.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_##macro_name##_FEATURES; \ SetNext(next, features.var_name); @@ -1077,18 +1095,13 @@ bool Device::GetSuitability(bool requires_swapchain) { #undef EXT_FEATURE #undef FEATURE - // Perform the feature test. + // Perform the feature test. physical.GetFeatures2(features2); - - if (instance_version >= VK_API_VERSION_1_4) { - LOG_INFO(Render_Vulkan, "Vulkan 1.4 feature enabled: dynamicPrimitiveTopologyUnrestricted = {}", - features_1_4.dynamicPrimitiveTopologyUnrestricted); - } // Base Vulkan 1.0 features are always valid regardless of instance version. features.features = features2.features; - // Some features are mandatory. Check those. +// Some features are mandatory. Check those. #define CHECK_FEATURE(feature, name) \ if (!features.feature.name) { \ LOG_ERROR(Render_Vulkan, "Missing required feature {}", #name); \ @@ -1106,21 +1119,21 @@ bool Device::GetSuitability(bool requires_swapchain) { #undef LOG_FEATURE #undef CHECK_FEATURE - // Generate linked list of properties. + // Generate linked list of properties. properties2.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PROPERTIES_2; - // Set next pointer. + // Set next pointer. next = &properties2.pNext; - // Get driver info. + // Get driver info. properties.driver.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DRIVER_PROPERTIES; SetNext(next, properties.driver); - // Retrieve subgroup properties. + // Retrieve subgroup properties. properties.subgroup_properties.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_PROPERTIES; SetNext(next, properties.subgroup_properties); - // Retrieve relevant extension properties. + // Retrieve relevant extension properties. if (extensions.shader_float_controls) { properties.float_controls.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES; @@ -1142,31 +1155,16 @@ bool Device::GetSuitability(bool requires_swapchain) { SetNext(next, properties.transform_feedback); } - VkPhysicalDeviceVulkan14Properties properties_1_4{}; - properties_1_4.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_4_PROPERTIES; - properties_1_4.pNext = nullptr; - - if (instance_version >= VK_API_VERSION_1_4) { - properties2.pNext = &properties_1_4; - } else { - properties2.pNext = nullptr; - } - // Perform the property fetch. physical.GetProperties2(properties2); - if (instance_version >= VK_API_VERSION_1_4) { - LOG_INFO(Render_Vulkan, "Vulkan 1.4 property maxSynchronization2Semaphores = {}", - properties_1_4.maxSynchronization2Semaphores); - } - // Store base properties - properties.properties = properties2.properties; + properties.properties = properties2.properties; - // Unload extensions if feature support is insufficient. + // Unload extensions if feature support is insufficient. RemoveUnsuitableExtensions(); - // Check limits. + // Check limits. struct Limit { u32 minimum; u32 value; @@ -1188,7 +1186,7 @@ bool Device::GetSuitability(bool requires_swapchain) { } } - // Return whether we were suitable. + // Return whether we were suitable. return suitable; } @@ -1199,14 +1197,14 @@ void Device::RemoveUnsuitableExtensions() { RemoveExtensionFeatureIfUnsuitable(extensions.custom_border_color, features.custom_border_color, VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME); - // VK_EXT_depth_bias_control + // VK_EXT_depth_bias_control extensions.depth_bias_control = features.depth_bias_control.depthBiasControl && features.depth_bias_control.leastRepresentableValueForceUnormRepresentation; RemoveExtensionFeatureIfUnsuitable(extensions.depth_bias_control, features.depth_bias_control, VK_EXT_DEPTH_BIAS_CONTROL_EXTENSION_NAME); - // VK_EXT_depth_clip_control + // VK_EXT_depth_clip_control extensions.depth_clip_control = features.depth_clip_control.depthClipControl; RemoveExtensionFeatureIfUnsuitable(extensions.depth_clip_control, features.depth_clip_control, VK_EXT_DEPTH_CLIP_CONTROL_EXTENSION_NAME); @@ -1217,13 +1215,13 @@ void Device::RemoveUnsuitableExtensions() { features.extended_dynamic_state, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME); - // VK_EXT_extended_dynamic_state2 + // VK_EXT_extended_dynamic_state2 extensions.extended_dynamic_state2 = features.extended_dynamic_state2.extendedDynamicState2; RemoveExtensionFeatureIfUnsuitable(extensions.extended_dynamic_state2, features.extended_dynamic_state2, - VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); + VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); - // VK_EXT_extended_dynamic_state3 + // VK_EXT_extended_dynamic_state3 dynamic_state3_blending = features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable && features.extended_dynamic_state3.extendedDynamicState3ColorBlendEquation && @@ -1239,27 +1237,27 @@ void Device::RemoveUnsuitableExtensions() { features.extended_dynamic_state3, VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME); - // VK_EXT_provoking_vertex + // VK_EXT_provoking_vertex extensions.provoking_vertex = features.provoking_vertex.provokingVertexLast && features.provoking_vertex.transformFeedbackPreservesProvokingVertex; - RemoveExtensionFeatureIfUnsuitable(extensions.provoking_vertex, features.provoking_vertex, - VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME); + // RemoveExtensionFeatureIfUnsuitable(extensions.provoking_vertex, features.provoking_vertex, + // VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME); - // VK_KHR_shader_atomic_int64 + // VK_KHR_shader_atomic_int64 extensions.shader_atomic_int64 = features.shader_atomic_int64.shaderBufferInt64Atomics && features.shader_atomic_int64.shaderSharedInt64Atomics; RemoveExtensionFeatureIfUnsuitable(extensions.shader_atomic_int64, features.shader_atomic_int64, VK_KHR_SHADER_ATOMIC_INT64_EXTENSION_NAME); - // VK_EXT_shader_demote_to_helper_invocation + // VK_EXT_shader_demote_to_helper_invocation extensions.shader_demote_to_helper_invocation = features.shader_demote_to_helper_invocation.shaderDemoteToHelperInvocation; RemoveExtensionFeatureIfUnsuitable(extensions.shader_demote_to_helper_invocation, features.shader_demote_to_helper_invocation, VK_EXT_SHADER_DEMOTE_TO_HELPER_INVOCATION_EXTENSION_NAME); - // VK_EXT_subgroup_size_control + // VK_EXT_subgroup_size_control extensions.subgroup_size_control = features.subgroup_size_control.subgroupSizeControl && properties.subgroup_size_control.minSubgroupSize <= GuestWarpSize && @@ -1268,7 +1266,7 @@ void Device::RemoveUnsuitableExtensions() { features.subgroup_size_control, VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME); - // VK_EXT_transform_feedback + // VK_EXT_transform_feedback extensions.transform_feedback = features.transform_feedback.transformFeedback && features.transform_feedback.geometryStreams && @@ -1279,14 +1277,14 @@ void Device::RemoveUnsuitableExtensions() { RemoveExtensionFeatureIfUnsuitable(extensions.transform_feedback, features.transform_feedback, VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME); - // VK_EXT_vertex_input_dynamic_state + // VK_EXT_vertex_input_dynamic_state extensions.vertex_input_dynamic_state = features.vertex_input_dynamic_state.vertexInputDynamicState; //RemoveExtensionFeatureIfUnsuitable(extensions.vertex_input_dynamic_state, - //features.vertex_input_dynamic_state, - //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); + //features.vertex_input_dynamic_state, + //VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME); - // VK_KHR_pipeline_executable_properties + // VK_KHR_pipeline_executable_properties if (Settings::values.renderer_shader_feedback.GetValue()) { extensions.pipeline_executable_properties = features.pipeline_executable_properties.pipelineExecutableInfo; @@ -1299,7 +1297,7 @@ void Device::RemoveUnsuitableExtensions() { VK_KHR_PIPELINE_EXECUTABLE_PROPERTIES_EXTENSION_NAME); } - // VK_KHR_workgroup_memory_explicit_layout + // VK_KHR_workgroup_memory_explicit_layout extensions.workgroup_memory_explicit_layout = features.features.shaderInt16 && features.workgroup_memory_explicit_layout.workgroupMemoryExplicitLayout && diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.h index 93dfdcb722..ddc9451a7e 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h @@ -84,7 +84,8 @@ VK_DEFINE_HANDLE(VmaAllocator) EXTENSION(NV, DEVICE_DIAGNOSTICS_CONFIG, device_diagnostics_config) \ EXTENSION(NV, GEOMETRY_SHADER_PASSTHROUGH, geometry_shader_passthrough) \ EXTENSION(NV, VIEWPORT_ARRAY2, viewport_array2) \ - EXTENSION(NV, VIEWPORT_SWIZZLE, viewport_swizzle) + EXTENSION(NV, VIEWPORT_SWIZZLE, viewport_swizzle) \ + EXTENSION(EXT, DESCRIPTOR_INDEXING, descriptor_indexing) // Define extensions which must be supported. #define FOR_EACH_VK_MANDATORY_EXTENSION(EXTENSION_NAME) \ @@ -404,6 +405,11 @@ public: return extensions.viewport_array2; } + /// Returns true if the device supporst VK_EXT_DESCRIPTOR_INDEXING + bool isExtDescriptorIndexingSupported() const { + return extensions.descriptor_indexing; + } + /// Returns true if the device supports VK_NV_geometry_shader_passthrough. bool IsNvGeometryShaderPassthroughSupported() const { return extensions.geometry_shader_passthrough; diff --git a/src/yuzu/configuration/configure_graphics_extensions.cpp b/src/yuzu/configuration/configure_graphics_extensions.cpp index 88bea9786e..51c7a6cdea 100644 --- a/src/yuzu/configuration/configure_graphics_extensions.cpp +++ b/src/yuzu/configuration/configure_graphics_extensions.cpp @@ -33,6 +33,9 @@ void ConfigureGraphicsExtensions::SetConfiguration() {} void ConfigureGraphicsExtensions::Setup(const ConfigurationShared::Builder& builder) { auto& layout = *ui->populate_target->layout(); std::map hold{}; // A map will sort the data for us + + QSlider *dyna_state = nullptr; + QCheckBox *dyna_state3 = nullptr; for (auto setting : Settings::values.linkage.by_category[Settings::Category::RendererExtensions]) { ConfigurationShared::Widget* widget = builder.BuildWidget(setting, apply_funcs); @@ -50,12 +53,22 @@ void ConfigureGraphicsExtensions::Setup(const ConfigurationShared::Builder& buil if (setting->Id() == Settings::values.dyna_state.Id()) { widget->slider->setTickInterval(1); widget->slider->setTickPosition(QSlider::TicksAbove); + dyna_state = widget->slider; + } else if (setting->Id() == Settings::values.dyna_state3.Id()) { + dyna_state3 = widget->checkbox; } } for (const auto& [id, widget] : hold) { layout.addWidget(widget); } + + connect(dyna_state, &QSlider::sliderMoved, this, [dyna_state3](int value) { + dyna_state3->setEnabled(value == 2); + if (value < 2) { + dyna_state3->setChecked(false); + } + }); } void ConfigureGraphicsExtensions::ApplyConfiguration() { diff --git a/src/yuzu/configuration/shared_translation.cpp b/src/yuzu/configuration/shared_translation.cpp index 59f00f384e..24216b6452 100644 --- a/src/yuzu/configuration/shared_translation.cpp +++ b/src/yuzu/configuration/shared_translation.cpp @@ -235,6 +235,19 @@ std::unique_ptr InitializeTranslations(QWidget* parent) { tr("Enables the VkExtendedDynamicState* extensions.\nHigher dynamic states will generally improve " "performance, but may cause issues on certain games or devices.")); + INSERT(Settings, dyna_state3, tr("EDS3 + Vertex Input"), + tr("Enables the VkExtendedDynamicState3 and VkVertexInputDynamicState extensions.\n" + "Only Vulkan 1.3+ devices support these extensions, and will generally see improved performance,\n" + "though certain games such as Breath of the Wild may see issues with this setting.")); + + INSERT(Settings, provoking_vertex, tr("Provoking Vertex"), + tr("Improves lighting and vertex handling in certain games.\n" + "Only Vulkan 1.0+ devices support this extension, notably excluding pre-Valhal ARM GPUs.")); + + INSERT(Settings, descriptor_indexing, tr("Descriptor Indexing"), + tr("Improves texture & buffer handling and the Maxwell translation layer.\n" + "Some Vulkan 1.1+ and all 1.2+ devices support this extension.")); + // Renderer (Debug) // System From ae61b65b6cb38a44acc10665080a40634785ad9c Mon Sep 17 00:00:00 2001 From: swurl Date: Thu, 8 May 2025 22:43:18 -0400 Subject: [PATCH 7/7] Remove Mali conditional for EDS Signed-off-by: swurl --- .../yuzu_emu/features/settings/model/view/SettingsItem.kt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt index d649c365e6..571aed7e69 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/view/SettingsItem.kt @@ -57,13 +57,6 @@ abstract class SettingsItem( return NativeInput.getStyleIndex(0) != NpadStyleIndex.Handheld } - if (setting.key == ByteSetting.RENDERER_DYNA_STATE.key) { - // Can't change on Mali GPU's otherwise no game loading for you - if (!GpuDriverHelper.supportsCustomDriverLoading()) { - return false - } - } - // Can't edit settings that aren't saveable in per-game config even if they are switchable if (NativeConfig.isPerGameConfigLoaded() && !setting.isSaveable) { return false