Plexi09/eden-miror
1
0
Fork 0
mirror of https://git.eden-emu.dev/eden-emu/eden synced 2026-05-16 23:27:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert "[vulkan] Adjustment ExtendedDynamicState"

Browse source
This commit is contained in:
CamilleLaVey 2026-04-15 18:53:18 -04:00
parent 2421a8c26e
commit c926b558da
2 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video_core/renderer_vulkan/fixed_pipeline_state.h
View file

@ -234,8 +234,8 @@ struct FixedPipelineState {
BitField<17, 2, u64> tessellation_spacing; BitField<17, 2, u64> tessellation_spacing;
BitField<19, 1, u64> tessellation_clockwise; BitField<19, 1, u64> tessellation_clockwise;
BitField<20, 5, u64> patch_control_points_minus_one; BitField<20, 5, u64> patch_control_points_minus_one;
BitField<25, 3, Maxwell::PrimitiveTopology> topology; BitField<25, 4, Maxwell::PrimitiveTopology> topology;
BitField<28, 4, Tegra::Texture::MsaaMode> msaa_mode; BitField<29, 4, Tegra::Texture::MsaaMode> msaa_mode;
}; };
union { union {
u32 raw2; u32 raw2;

30
src/video_core/vulkan_common/vulkan_device.cpp
View file

@ -664,18 +664,18 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
core_dynamic_depth_bias = (dld.vkCmdSetDepthBias != nullptr) || (dld.vkCmdSetDepthBias2EXT != nullptr) || core_dynamic_depth_bias = (dld.vkCmdSetDepthBias != nullptr) || (dld.vkCmdSetDepthBias2EXT != nullptr) ||
(features.depth_bias_control.depthBiasControl != VK_FALSE); (features.depth_bias_control.depthBiasControl != VK_FALSE);
if (features.features.depthBounds && dld.vkCmdSetDepthBounds == nullptr) { if (features.core.features.depthBounds && dld.vkCmdSetDepthBounds == nullptr) {
features.features.depthBounds = VK_FALSE; features.core.features.depthBounds = VK_FALSE;
core_dynamic_depth_bounds = false; core_dynamic_depth_bounds = false;
} else { } else {
core_dynamic_depth_bounds = (dld.vkCmdSetDepthBounds != nullptr) && features.features.depthBounds; core_dynamic_depth_bounds = (dld.vkCmdSetDepthBounds != nullptr) && features.core.features.depthBounds;
} }
if (features.features.wideLines && dld.vkCmdSetLineWidth == nullptr) { if (features.core.features.wideLines && dld.vkCmdSetLineWidth == nullptr) {
features.features.wideLines = VK_FALSE; features.core.features.wideLines = VK_FALSE;
core_dynamic_line_width = false; core_dynamic_line_width = false;
} else { } else {
core_dynamic_line_width = (dld.vkCmdSetLineWidth != nullptr) && features.features.wideLines; core_dynamic_line_width = (dld.vkCmdSetLineWidth != nullptr) && features.core.features.wideLines;
} }
core_dynamic_stencil_masks = (dld.vkCmdSetStencilCompareMask != nullptr) && core_dynamic_stencil_masks = (dld.vkCmdSetStencilCompareMask != nullptr) &&
@ -684,7 +684,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
break; break;
case Settings::ExtendedDynamicState::EDS1: case Settings::ExtendedDynamicState::EDS1:
// Level 1: Enable EDS1, disable EDS2 and EDS3 // Level 1: Enable EDS1, disable EDS2 and EDS3
if (dyna_state != Settings::ExtendedDynamicState::Disabled && extensions.extended_dynamic_state) { if (dyna_state_enabled && extensions.extended_dynamic_state) {
eds1_cull_mode = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetCullModeEXT != nullptr); eds1_cull_mode = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetCullModeEXT != nullptr);
eds1_front_face = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetFrontFaceEXT != nullptr); eds1_front_face = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetFrontFaceEXT != nullptr);
eds1_depth_test_enable = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetDepthTestEnableEXT != nullptr); eds1_depth_test_enable = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetDepthTestEnableEXT != nullptr);
@ -694,24 +694,24 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
eds1_stencil_test_enable = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetStencilTestEnableEXT != nullptr); eds1_stencil_test_enable = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetStencilTestEnableEXT != nullptr);
eds1_stencil_op = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetStencilOpEXT != nullptr); eds1_stencil_op = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdSetStencilOpEXT != nullptr);
eds1_vertex_input_binding_stride = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdBindVertexBuffers2EXT != nullptr); vertex_input_binding_stride = features.extended_dynamic_state.extendedDynamicState && (dld.vkCmdBindVertexBuffers2EXT != nullptr);
const bool eds1_any = eds1_cull_mode || eds1_front_face || eds1_depth_test_enable || const bool eds1_any = eds1_cull_mode || eds1_front_face || eds1_depth_test_enable ||
eds1_depth_write_enable || eds1_depth_compare_op || eds1_depth_bounds_test_enable || eds1_depth_write_enable || eds1_depth_compare_op || eds1_depth_bounds_test_enable ||
eds1_stencil_test_enable || eds1_stencil_op || eds1_vertex_input_binding_stride; eds1_stencil_test_enable || eds1_stencil_op || vertex_input_binding_stride;
if (!eds1_any) { if (!eds1_any) {
extensions.extended_dynamic_state = false; extensions.extended_dynamic_state = false;
RemoveExtensionFeature(extensions.extended_dynamic_state, features.extended_dynamic_state, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME); RemoveExtensionFeature(extensions.extended_dynamic_state, features.extended_dynamic_state, VK_EXT_EXTENDED_DYNAMIC_STATE_EXTENSION_NAME);
// Clear flags // Clear flags
eds1_cull_mode = eds1_front_face = eds1_depth_test_enable = eds1_depth_write_enable = false; eds1_cull_mode = eds1_front_face = eds1_depth_test_enable = eds1_depth_write_enable = false;
eds1_depth_compare_op = eds1_depth_bounds_test_enable = eds1_stencil_test_enable = eds1_stencil_op = false; eds1_depth_compare_op = eds1_depth_bounds_test_enable = eds1_stencil_test_enable = eds1_stencil_op = false;
eds1_vertex_input_binding_stride = false; vertex_input_binding_stride = false;
} }
} else { } else {
extensions.extended_dynamic_state = false; extensions.extended_dynamic_state = false;
eds1_cull_mode = eds1_front_face = eds1_depth_test_enable = eds1_depth_write_enable = false; eds1_cull_mode = eds1_front_face = eds1_depth_test_enable = eds1_depth_write_enable = false;
eds1_depth_compare_op = eds1_depth_bounds_test_enable = eds1_stencil_test_enable = eds1_stencil_op = false; eds1_depth_compare_op = eds1_depth_bounds_test_enable = eds1_stencil_test_enable = eds1_stencil_op = false;
eds1_vertex_input_binding_stride = false; vertex_input_binding_stride = false;
} }
RemoveExtensionFeature(extensions.extended_dynamic_state2, features.extended_dynamic_state2, RemoveExtensionFeature(extensions.extended_dynamic_state2, features.extended_dynamic_state2,
VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME); VK_EXT_EXTENDED_DYNAMIC_STATE_2_EXTENSION_NAME);
@ -729,7 +729,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
extensions.extended_dynamic_state2 = false; extensions.extended_dynamic_state2 = false;
} }
} }
if (dyna_state != Settings::ExtendedDynamicState::Disabled && extensions.extended_dynamic_state2) { if (dyna_state_enabled && extensions.extended_dynamic_state2) {
eds2_depth_bias_enable = features.extended_dynamic_state2.extendedDynamicState2 && (dld.vkCmdSetDepthBiasEnableEXT != nullptr); eds2_depth_bias_enable = features.extended_dynamic_state2.extendedDynamicState2 && (dld.vkCmdSetDepthBiasEnableEXT != nullptr);
eds2_primitive_restart_enable = features.extended_dynamic_state2.extendedDynamicState2 && (dld.vkCmdSetPrimitiveRestartEnableEXT != nullptr); eds2_primitive_restart_enable = features.extended_dynamic_state2.extendedDynamicState2 && (dld.vkCmdSetPrimitiveRestartEnableEXT != nullptr);
eds2_rasterizer_discard_enable = features.extended_dynamic_state2.extendedDynamicState2 && (dld.vkCmdSetRasterizerDiscardEnableEXT != nullptr); eds2_rasterizer_discard_enable = features.extended_dynamic_state2.extendedDynamicState2 && (dld.vkCmdSetRasterizerDiscardEnableEXT != nullptr);
@ -766,7 +766,7 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
extensions.extended_dynamic_state3 = false; extensions.extended_dynamic_state3 = false;
} }
} }
if (dyna_state != Settings::ExtendedDynamicState::Disabled && extensions.extended_dynamic_state3) { if (dyna_state_enabled && extensions.extended_dynamic_state3) {
if (!(features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable && (dld.vkCmdSetColorBlendEnableEXT != nullptr))) { if (!(features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable && (dld.vkCmdSetColorBlendEnableEXT != nullptr))) {
features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = VK_FALSE; features.extended_dynamic_state3.extendedDynamicState3ColorBlendEnable = VK_FALSE;
} }
@ -833,10 +833,10 @@ Device::Device(VkInstance instance_, vk::PhysicalDevice physical_, VkSurfaceKHR
} }
if (vids_entrypoint && features.vertex_input_dynamic_state.vertexInputDynamicState) { if (vids_entrypoint && features.vertex_input_dynamic_state.vertexInputDynamicState) {
eds1_vertex_input_binding_stride = false; vertex_input_binding_stride = false;
} else { } else {
// Only enable binding stride if EDS1 and the VB2 entrypoint are available. // Only enable binding stride if EDS1 and the VB2 entrypoint are available.
eds1_vertex_input_binding_stride = features.extended_dynamic_state.extendedDynamicState && vb2_entrypoint; vertex_input_binding_stride = features.extended_dynamic_state.extendedDynamicState && vb2_entrypoint;
} }
if (!features.vertex_input_dynamic_state.vertexInputDynamicState) { if (!features.vertex_input_dynamic_state.vertexInputDynamicState) {