VERY experimental Nintendo Switch 2 emulator
C++
vulkan_device: Fix subgroup_size_control detection on Vulkan 1.3
Ameer J09cb3bf896a9
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cppindex bd67e27edf..710929ac5c 100644--- a/src/video_core/vulkan_common/vulkan_device.cpp+++ b/src/video_core/vulkan_common/vulkan_device.cpp@@ -963,7 +963,7 @@ bool Device::GetSuitability(bool requires_swapchain) {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR;SetNext(next, properties.push_descriptor);}- if (extensions.subgroup_size_control) {+ if (extensions.subgroup_size_control || features.subgroup_size_control.subgroupSizeControl) {properties.subgroup_size_control.sType =VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES;SetNext(next, properties.subgroup_size_control);diff --git a/src/video_core/vulkan_common/vulkan_device.h b/src/video_core/vulkan_common/vulkan_device.hindex 78a4ba8f03..d8dd41e51d 100644--- a/src/video_core/vulkan_common/vulkan_device.h+++ b/src/video_core/vulkan_common/vulkan_device.h@@ -35,7 +35,8 @@ VK_DEFINE_HANDLE(VmaAllocator)#define FOR_EACH_VK_FEATURE_1_3(FEATURE) \FEATURE(EXT, ShaderDemoteToHelperInvocation, SHADER_DEMOTE_TO_HELPER_INVOCATION, \- shader_demote_to_helper_invocation)+ shader_demote_to_helper_invocation) \+ FEATURE(EXT, SubgroupSizeControl, SUBGROUP_SIZE_CONTROL, subgroup_size_control)// Define all features which may be used by the implementation and require an extension here.#define FOR_EACH_VK_FEATURE_EXT(FEATURE) \@@ -50,7 +51,6 @@ VK_DEFINE_HANDLE(VmaAllocator)primitive_topology_list_restart) \FEATURE(EXT, ProvokingVertex, PROVOKING_VERTEX, provoking_vertex) \FEATURE(EXT, Robustness2, ROBUSTNESS_2, robustness2) \- FEATURE(EXT, SubgroupSizeControl, SUBGROUP_SIZE_CONTROL, subgroup_size_control) \FEATURE(EXT, TransformFeedback, TRANSFORM_FEEDBACK, transform_feedback) \FEATURE(EXT, VertexInputDynamicState, VERTEX_INPUT_DYNAMIC_STATE, vertex_input_dynamic_state) \FEATURE(KHR, PipelineExecutableProperties, PIPELINE_EXECUTABLE_PROPERTIES, \