diff options
| author | Ameer J <52414509+ameerj@users.noreply.github.com> | 2023-08-03 02:27:34 +0200 |
|---|---|---|
| committer | Ameer J <52414509+ameerj@users.noreply.github.com> | 2023-08-03 02:45:03 +0200 |
| commit | cd80cbc420ab2dbe7628e0b1f57300553865c804 (patch) | |
| tree | bf874d42305ce1d9b514ae28966f09b107571d54 | |
| parent | vulkan_device: Fix VK_EXT_subgroup_size_control detection (diff) | |
| download | yuzu-cd80cbc420ab2dbe7628e0b1f57300553865c804.tar yuzu-cd80cbc420ab2dbe7628e0b1f57300553865c804.tar.gz yuzu-cd80cbc420ab2dbe7628e0b1f57300553865c804.tar.bz2 yuzu-cd80cbc420ab2dbe7628e0b1f57300553865c804.tar.lz yuzu-cd80cbc420ab2dbe7628e0b1f57300553865c804.tar.xz yuzu-cd80cbc420ab2dbe7628e0b1f57300553865c804.tar.zst yuzu-cd80cbc420ab2dbe7628e0b1f57300553865c804.zip | |
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_device.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_device.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index bd67e27ed..710929ac5 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.h index 78a4ba8f0..d8dd41e51 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, \ |