diff options
Diffstat (limited to 'src')
| -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) { | |||
| 963 | VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR; | 963 | VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PUSH_DESCRIPTOR_PROPERTIES_KHR; |
| 964 | SetNext(next, properties.push_descriptor); | 964 | SetNext(next, properties.push_descriptor); |
| 965 | } | 965 | } |
| 966 | if (extensions.subgroup_size_control) { | 966 | if (extensions.subgroup_size_control || features.subgroup_size_control.subgroupSizeControl) { |
| 967 | properties.subgroup_size_control.sType = | 967 | properties.subgroup_size_control.sType = |
| 968 | VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES; | 968 | VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SUBGROUP_SIZE_CONTROL_PROPERTIES; |
| 969 | SetNext(next, properties.subgroup_size_control); | 969 | 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 be3ed45ff..d8dd41e51 100644 --- a/src/video_core/vulkan_common/vulkan_device.h +++ b/src/video_core/vulkan_common/vulkan_device.h | |||
| @@ -20,7 +20,6 @@ VK_DEFINE_HANDLE(VmaAllocator) | |||
| 20 | // Vulkan version in the macro describes the minimum version required for feature availability. | 20 | // Vulkan version in the macro describes the minimum version required for feature availability. |
| 21 | // If the Vulkan version is lower than the required version, the named extension is required. | 21 | // If the Vulkan version is lower than the required version, the named extension is required. |
| 22 | #define FOR_EACH_VK_FEATURE_1_1(FEATURE) \ | 22 | #define FOR_EACH_VK_FEATURE_1_1(FEATURE) \ |
| 23 | FEATURE(EXT, SubgroupSizeControl, SUBGROUP_SIZE_CONTROL, subgroup_size_control) \ | ||
| 24 | FEATURE(KHR, 16BitStorage, 16BIT_STORAGE, bit16_storage) \ | 23 | FEATURE(KHR, 16BitStorage, 16BIT_STORAGE, bit16_storage) \ |
| 25 | FEATURE(KHR, ShaderAtomicInt64, SHADER_ATOMIC_INT64, shader_atomic_int64) \ | 24 | FEATURE(KHR, ShaderAtomicInt64, SHADER_ATOMIC_INT64, shader_atomic_int64) \ |
| 26 | FEATURE(KHR, ShaderDrawParameters, SHADER_DRAW_PARAMETERS, shader_draw_parameters) \ | 25 | FEATURE(KHR, ShaderDrawParameters, SHADER_DRAW_PARAMETERS, shader_draw_parameters) \ |
| @@ -36,7 +35,8 @@ VK_DEFINE_HANDLE(VmaAllocator) | |||
| 36 | 35 | ||
| 37 | #define FOR_EACH_VK_FEATURE_1_3(FEATURE) \ | 36 | #define FOR_EACH_VK_FEATURE_1_3(FEATURE) \ |
| 38 | FEATURE(EXT, ShaderDemoteToHelperInvocation, SHADER_DEMOTE_TO_HELPER_INVOCATION, \ | 37 | FEATURE(EXT, ShaderDemoteToHelperInvocation, SHADER_DEMOTE_TO_HELPER_INVOCATION, \ |
| 39 | shader_demote_to_helper_invocation) | 38 | shader_demote_to_helper_invocation) \ |
| 39 | FEATURE(EXT, SubgroupSizeControl, SUBGROUP_SIZE_CONTROL, subgroup_size_control) | ||
| 40 | 40 | ||
| 41 | // Define all features which may be used by the implementation and require an extension here. | 41 | // Define all features which may be used by the implementation and require an extension here. |
| 42 | #define FOR_EACH_VK_FEATURE_EXT(FEATURE) \ | 42 | #define FOR_EACH_VK_FEATURE_EXT(FEATURE) \ |