diff options
author | Fernando Sahmkow <fsahmkow27@gmail.com> | 2022-12-05 15:44:10 +0100 |
---|---|---|
committer | Fernando Sahmkow <fsahmkow27@gmail.com> | 2023-01-01 22:43:57 +0100 |
commit | c897c55e3cf007b771351267ff61114d36011ac6 (patch) | |
tree | 5bcdb7590093ddab1433960593b483b94a1eaa08 /src/video_core/vulkan_common/vulkan_device.cpp | |
parent | DMAPusher: Improve collection of non executing methods (diff) | |
download | yuzu-c897c55e3cf007b771351267ff61114d36011ac6.tar yuzu-c897c55e3cf007b771351267ff61114d36011ac6.tar.gz yuzu-c897c55e3cf007b771351267ff61114d36011ac6.tar.bz2 yuzu-c897c55e3cf007b771351267ff61114d36011ac6.tar.lz yuzu-c897c55e3cf007b771351267ff61114d36011ac6.tar.xz yuzu-c897c55e3cf007b771351267ff61114d36011ac6.tar.zst yuzu-c897c55e3cf007b771351267ff61114d36011ac6.zip |
Diffstat (limited to 'src/video_core/vulkan_common/vulkan_device.cpp')
-rw-r--r-- | src/video_core/vulkan_common/vulkan_device.cpp | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 207fae8c9..9a420a293 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -569,6 +569,34 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR LOG_INFO(Render_Vulkan, "Device doesn't support extended dynamic state"); } + VkPhysicalDeviceExtendedDynamicState2FeaturesEXT dynamic_state2; + if (ext_extended_dynamic_state2) { + dynamic_state2 = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT, + .pNext = nullptr, + .extendedDynamicState2 = VK_TRUE, + .extendedDynamicState2LogicOp = ext_extended_dynamic_state2_extra ? VK_TRUE : VK_FALSE, + .extendedDynamicState2PatchControlPoints = + ext_extended_dynamic_state2_extra ? VK_TRUE : VK_FALSE, + }; + SetNext(next, dynamic_state2); + } else { + LOG_INFO(Render_Vulkan, "Device doesn't support extended dynamic state 2"); + } + + VkPhysicalDeviceExtendedDynamicState3FeaturesEXT dynamic_state3; + if (ext_extended_dynamic_state3) { + dynamic_state3 = { + .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT, + .pNext = nullptr, + .extendedDynamicState3ColorBlendEnable = VK_TRUE, + .extendedDynamicState3ColorBlendEquation = VK_TRUE, + }; + SetNext(next, dynamic_state3); + } else { + LOG_INFO(Render_Vulkan, "Device doesn't support extended dynamic state 3"); + } + VkPhysicalDeviceLineRasterizationFeaturesEXT line_raster; if (ext_line_rasterization) { line_raster = { @@ -1091,6 +1119,8 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) { bool has_ext_transform_feedback{}; bool has_ext_custom_border_color{}; bool has_ext_extended_dynamic_state{}; + bool has_ext_extended_dynamic_state2{}; + bool has_ext_extended_dynamic_state3{}; bool has_ext_shader_atomic_int64{}; bool has_ext_provoking_vertex{}; bool has_ext_vertex_input_dynamic_state{}; @@ -1135,6 +1165,10 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) { test(has_ext_transform_feedback, VK_EXT_TRANSFORM_FEEDBACK_EXTENSION_NAME, false); test(has_ext_custom_border_color, VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME, false); test(has_ext_extended_dynamic_state, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME, false); + test(has_ext_extended_dynamic_state2, VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME, + false); + test(has_ext_extended_dynamic_state3, VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME, + false); test(has_ext_subgroup_size_control, VK_EXT_SUBGROUP_SIZE_CONTROL_EXTENSION_NAME, true); test(has_ext_provoking_vertex, VK_EXT_PROVOKING_VERTEX_EXTENSION_NAME, false); test(has_ext_vertex_input_dynamic_state, VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME, @@ -1284,6 +1318,36 @@ std::vector<const char*> Device::LoadExtensions(bool requires_surface) { ext_extended_dynamic_state = true; } } + if (has_ext_extended_dynamic_state2) { + VkPhysicalDeviceExtendedDynamicState2FeaturesEXT extended_dynamic_state2; + extended_dynamic_state2.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_2_FEATURES_EXT; + extended_dynamic_state2.pNext = nullptr; + features.pNext = &extended_dynamic_state2; + physical.GetFeatures2(features); + + if (extended_dynamic_state2.extendedDynamicState2) { + extensions.push_back(VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); + ext_extended_dynamic_state2 = true; + ext_extended_dynamic_state2_extra = + extended_dynamic_state2.extendedDynamicState2LogicOp && + extended_dynamic_state2.extendedDynamicState2PatchControlPoints; + } + } + if (has_ext_extended_dynamic_state3) { + VkPhysicalDeviceExtendedDynamicState3FeaturesEXT extended_dynamic_state3; + extended_dynamic_state3.sType = + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_3_FEATURES_EXT; + extended_dynamic_state3.pNext = nullptr; + features.pNext = &extended_dynamic_state3; + physical.GetFeatures2(features); + + if (extended_dynamic_state3.extendedDynamicState3ColorBlendEnable && + extended_dynamic_state3.extendedDynamicState3ColorBlendEquation) { + extensions.push_back(VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME); + ext_extended_dynamic_state3 = true; + } + } if (has_ext_line_rasterization) { VkPhysicalDeviceLineRasterizationFeaturesEXT line_raster; line_raster.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_LINE_RASTERIZATION_FEATURES_EXT; |