VERY experimental Nintendo Switch 2 emulator
C++
[video_core] Clean up the code and fix some inconsistences (#3015)
MaranBrd89df63a287b
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cppindex 10ee14773f..0532df05d8 100644--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp@@ -414,13 +414,8 @@ PipelineCache::PipelineCache(Tegra::MaxwellDeviceMemoryManager& device_memory_,.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_dynamic_vertex_input = device.IsExtVertexInputDynamicStateSupported() && dynamic_state > 2,};-- 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/renderer_vulkan/vk_rasterizer.cpp b/src/video_core/renderer_vulkan/vk_rasterizer.cppindex 6bad5eca0b..530c7e8e41 100644--- a/src/video_core/renderer_vulkan/vk_rasterizer.cpp+++ b/src/video_core/renderer_vulkan/vk_rasterizer.cpp@@ -956,38 +956,24 @@ void RasterizerVulkan::UpdateDynamicStates() {const u8 dynamic_state = Settings::values.dyna_state.GetValue();- auto 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(),- };-- if (features.has_extended_dynamic_state) {+ if (device.IsExtExtendedDynamicStateSupported() && dynamic_state > 0) {UpdateCullMode(regs);UpdateDepthCompareOp(regs);UpdateFrontFace(regs);UpdateStencilOp(regs);-if (state_tracker.TouchStateEnable()) {UpdateDepthBoundsTestEnable(regs);UpdateDepthTestEnable(regs);UpdateDepthWriteEnable(regs);UpdateStencilTestEnable(regs);-- if (features.has_extended_dynamic_state_2) {+ if (device.IsExtExtendedDynamicState2Supported() && dynamic_state > 1) {UpdatePrimitiveRestartEnable(regs);UpdateRasterizerDiscardEnable(regs);UpdateDepthBiasEnable(regs);}-- if (features.has_extended_dynamic_state_3_enables) {+ if (device.IsExtExtendedDynamicState3EnablesSupported() && dynamic_state > 2) {using namespace Tegra::Engines;-- if (device.GetDriverID() == VkDriverIdKHR::VK_DRIVER_ID_AMD_OPEN_SOURCE ||- device.GetDriverID() == VkDriverIdKHR::VK_DRIVER_ID_AMD_PROPRIETARY) {+ if (device.GetDriverID() == VkDriverIdKHR::VK_DRIVER_ID_AMD_OPEN_SOURCE || device.GetDriverID() == VkDriverIdKHR::VK_DRIVER_ID_AMD_PROPRIETARY) {struct In {const Maxwell3D::Regs::VertexAttribute::Type d;In(Maxwell3D::Regs::VertexAttribute::Type n) : d(n) {}@@ -995,33 +981,28 @@ void RasterizerVulkan::UpdateDynamicStates() {return n.type == d;}};-- auto has_float = std::any_of(regs.vertex_attrib_format.begin(),- regs.vertex_attrib_format.end(),- In(Maxwell3D::Regs::VertexAttribute::Type::Float));-- if (regs.logic_op.enable)+ auto has_float = std::any_of(regs.vertex_attrib_format.begin(), regs.vertex_attrib_format.end(), In(Maxwell3D::Regs::VertexAttribute::Type::Float));+ if (regs.logic_op.enable) {regs.logic_op.enable = static_cast<u32>(!has_float);-+ }UpdateLogicOpEnable(regs);} else {UpdateLogicOpEnable(regs);- }+ }UpdateDepthClampEnable(regs);+ UpdateLineStippleEnable(regs);+ UpdateConservativeRasterizationMode(regs);}}- if (features.has_extended_dynamic_state_2_extra) {+ if (device.IsExtExtendedDynamicState2ExtrasSupported() && dynamic_state > 1) {UpdateLogicOp(regs);}- if (features.has_extended_dynamic_state_3_enables) {+ if (device.IsExtExtendedDynamicState3BlendingSupported() && dynamic_state > 2) {UpdateBlending(regs);- UpdateLineStippleEnable(regs);- UpdateConservativeRasterizationMode(regs);}}- if (features.has_dynamic_vertex_input) {- if (auto* gp = pipeline_cache.CurrentGraphicsPipeline();- gp && gp->HasDynamicVertexInput()) {+ if (device.IsExtVertexInputDynamicStateSupported() && dynamic_state > 2) {+ if (auto* gp = pipeline_cache.CurrentGraphicsPipeline(); gp && gp->HasDynamicVertexInput()) {UpdateVertexInput(regs);}}diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex 7b7c4b0b78..81e60f1c6a 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -745,21 +745,20 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHRif (Settings::values.dyna_state.GetValue() == 0) {must_emulate_scaled_formats = true;- LOG_INFO(Render_Vulkan, "Dynamic state is disabled (dyna_state = 0), forcing scaled format emulation ON");+ LOG_INFO(Render_Vulkan, "Extended dynamic state is fully disabled, scaled format emulation is ON");- // Disable dynamic state 1-3 and all extensionsRemoveExtensionFeature(extensions.custom_border_color, features.custom_border_color, VK_EXT_CUSTOM_BORDER_COLOR_EXTENSION_NAME);RemoveExtensionFeature(extensions.extended_dynamic_state, features.extended_dynamic_state, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);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.extended_dynamic_state3, features.extended_dynamic_state3, VK_EXT_EXTENDED_DYNAMIC_STATE_3_EXTENSION_NAME);+ RemoveExtensionFeature(extensions.vertex_input_dynamic_state, features.vertex_input_dynamic_state, VK_EXT_VERTEX_INPUT_DYNAMIC_STATE_EXTENSION_NAME);dynamic_state3_blending = false;dynamic_state3_enables = false;LOG_INFO(Render_Vulkan, "All dynamic state extensions and features have been disabled");} else {must_emulate_scaled_formats = false;- LOG_INFO(Render_Vulkan, "Dynamic state is enabled (dyna_state = 1-3), disabling scaled format emulation");+ LOG_INFO(Render_Vulkan, "Extended dynamic state is enabled, scaled format emulation is OFF");}logical = vk::Device::Create(physical, queue_cis, ExtensionListForVulkan(loaded_extensions), first_next, dld);