From 20efd9eff30fd4baaa2ad45b8bf3242c93a98d6c Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Thu, 3 Mar 2022 22:28:03 +0000 Subject: [PATCH] venus: group extensions promoted to 1.3 Signed-off-by: Yiwei Zhang Part-of: --- src/virtio/vulkan/vn_physical_device.c | 26 ++++++++++++++++---------- src/virtio/vulkan/vn_physical_device.h | 6 ++++-- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c index 29bf4eca746..a2c8aa412d9 100644 --- a/src/virtio/vulkan/vn_physical_device.c +++ b/src/virtio/vulkan/vn_physical_device.c @@ -119,15 +119,17 @@ vn_physical_device_init_features(struct vn_physical_device *physical_dev) VULKAN_MEMORY_MODEL_FEATURES, features2); } - /* EXT */ + /* Vulkan 1.3 */ VN_ADD_EXT_TO_PNEXT(exts->EXT_4444_formats, feats->argb_4444_formats, 4444_FORMATS_FEATURES_EXT, features2); - VN_ADD_EXT_TO_PNEXT(exts->EXT_custom_border_color, - feats->custom_border_color, - CUSTOM_BORDER_COLOR_FEATURES_EXT, features2); VN_ADD_EXT_TO_PNEXT(exts->EXT_extended_dynamic_state, feats->extended_dynamic_state, EXTENDED_DYNAMIC_STATE_FEATURES_EXT, features2); + + /* EXT */ + VN_ADD_EXT_TO_PNEXT(exts->EXT_custom_border_color, + feats->custom_border_color, + CUSTOM_BORDER_COLOR_FEATURES_EXT, features2); VN_ADD_EXT_TO_PNEXT(exts->EXT_transform_feedback, feats->transform_feedback, TRANSFORM_FEEDBACK_FEATURES_EXT, features2); @@ -1625,10 +1627,12 @@ vn_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, VkPhysicalDeviceBufferDeviceAddressFeatures *buffer_device_address; VkPhysicalDeviceVulkanMemoryModelFeatures *vulkan_memory_model; - /* EXT */ + /* Vulkan 1.3 */ VkPhysicalDevice4444FormatsFeaturesEXT *argb_4444_formats; - VkPhysicalDeviceCustomBorderColorFeaturesEXT *custom_border_color; VkPhysicalDeviceExtendedDynamicStateFeaturesEXT *extended_dynamic_state; + + /* EXT */ + VkPhysicalDeviceCustomBorderColorFeaturesEXT *custom_border_color; VkPhysicalDeviceTransformFeedbackFeaturesEXT *transform_feedback; } u; @@ -1790,16 +1794,18 @@ vn_GetPhysicalDeviceFeatures2(VkPhysicalDevice physicalDevice, vk12_feats->vulkanMemoryModelAvailabilityVisibilityChains; break; - /* EXT */ + /* Vulkan 1.3 */ case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_4444_FORMATS_FEATURES_EXT: *u.argb_4444_formats = feats->argb_4444_formats; break; - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT: - *u.custom_border_color = feats->custom_border_color; - break; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_DYNAMIC_STATE_FEATURES_EXT: *u.extended_dynamic_state = feats->extended_dynamic_state; break; + + /* EXT */ + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CUSTOM_BORDER_COLOR_FEATURES_EXT: + *u.custom_border_color = feats->custom_border_color; + break; case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TRANSFORM_FEEDBACK_FEATURES_EXT: *u.transform_feedback = feats->transform_feedback; break; diff --git a/src/virtio/vulkan/vn_physical_device.h b/src/virtio/vulkan/vn_physical_device.h index a16d2d7b2b4..8d1ecde1f8c 100644 --- a/src/virtio/vulkan/vn_physical_device.h +++ b/src/virtio/vulkan/vn_physical_device.h @@ -22,10 +22,12 @@ struct vn_physical_device_features { VkPhysicalDeviceVulkan11Features vulkan_1_1; VkPhysicalDeviceVulkan12Features vulkan_1_2; - /* EXT */ + /* Vulkan 1.3 */ VkPhysicalDevice4444FormatsFeaturesEXT argb_4444_formats; - VkPhysicalDeviceCustomBorderColorFeaturesEXT custom_border_color; VkPhysicalDeviceExtendedDynamicStateFeaturesEXT extended_dynamic_state; + + /* EXT */ + VkPhysicalDeviceCustomBorderColorFeaturesEXT custom_border_color; VkPhysicalDeviceTransformFeedbackFeaturesEXT transform_feedback; };