From 7a0b0dd931f75cd77a26a2b1c641074739fa044d Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Thu, 29 Apr 2021 12:08:48 -0700 Subject: [PATCH] venus: rename vn_instance::renderer_version Rename renderer_version to renderer_api_version. Signed-off-by: Chia-I Wu Reviewed-by: Yiwei Zhang Part-of: --- src/virtio/vulkan/vn_device.c | 24 ++++++++++++------------ src/virtio/vulkan/vn_device.h | 3 ++- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/virtio/vulkan/vn_device.c b/src/virtio/vulkan/vn_device.c index a3acf12b331..7cad27c68ab 100644 --- a/src/virtio/vulkan/vn_device.c +++ b/src/virtio/vulkan/vn_device.c @@ -95,22 +95,22 @@ vn_instance_init_version(struct vn_instance *instance) if (renderer_version < VN_MIN_RENDERER_VERSION) { if (VN_DEBUG(INIT)) { vn_log(instance, "unsupported renderer instance version %d.%d", - VK_VERSION_MAJOR(instance->renderer_version), - VK_VERSION_MINOR(instance->renderer_version)); + VK_VERSION_MAJOR(instance->renderer_api_version), + VK_VERSION_MINOR(instance->renderer_api_version)); } return VK_ERROR_INITIALIZATION_FAILED; } - instance->renderer_version = + instance->renderer_api_version = instance->base.base.app_info.api_version > VN_MIN_RENDERER_VERSION ? instance->base.base.app_info.api_version : VN_MIN_RENDERER_VERSION; if (VN_DEBUG(INIT)) { vn_log(instance, "vk instance version %d.%d.%d", - VK_VERSION_MAJOR(instance->renderer_version), - VK_VERSION_MINOR(instance->renderer_version), - VK_VERSION_PATCH(instance->renderer_version)); + VK_VERSION_MAJOR(instance->renderer_api_version), + VK_VERSION_MINOR(instance->renderer_api_version), + VK_VERSION_PATCH(instance->renderer_api_version)); } return VK_SUCCESS; @@ -1618,8 +1618,8 @@ vn_physical_device_init_version(struct vn_physical_device *physical_dev) } physical_dev->renderer_version = props.apiVersion; - if (physical_dev->renderer_version > instance->renderer_version) - physical_dev->renderer_version = instance->renderer_version; + if (physical_dev->renderer_version > instance->renderer_api_version) + physical_dev->renderer_version = instance->renderer_api_version; return VK_SUCCESS; } @@ -1859,16 +1859,16 @@ vn_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, local_create_info.enabledExtensionCount = 0; pCreateInfo = &local_create_info; - /* request at least instance->renderer_version */ + /* request at least instance->renderer_api_version */ VkApplicationInfo local_app_info = { .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, - .apiVersion = instance->renderer_version, + .apiVersion = instance->renderer_api_version, }; if (instance->base.base.app_info.api_version < - instance->renderer_version) { + instance->renderer_api_version) { if (pCreateInfo->pApplicationInfo) { local_app_info = *pCreateInfo->pApplicationInfo; - local_app_info.apiVersion = instance->renderer_version; + local_app_info.apiVersion = instance->renderer_api_version; } local_create_info.pApplicationInfo = &local_app_info; } diff --git a/src/virtio/vulkan/vn_device.h b/src/virtio/vulkan/vn_device.h index ebac430e5b2..1188d9f113d 100644 --- a/src/virtio/vulkan/vn_device.h +++ b/src/virtio/vulkan/vn_device.h @@ -27,7 +27,8 @@ struct vn_instance { struct vn_renderer *renderer; struct vn_renderer_info renderer_info; - uint32_t renderer_version; + + uint32_t renderer_api_version; /* to synchronize renderer/ring */ mtx_t roundtrip_mutex;