From b6aa038bfc287c15c68dd4446458d5159f6bc668 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Thu, 6 Jan 2022 23:43:24 +0000 Subject: [PATCH] vkr: move get_fence_fd to vkr_device This is to prepare for extension cleanup and autogen. Signed-off-by: Yiwei Zhang Reviewed-by: Chia-I Wu Reviewed-by: Ryan Neph --- src/venus/vkr_device.c | 2 ++ src/venus/vkr_device.h | 1 + src/venus/vkr_instance.c | 3 --- src/venus/vkr_instance.h | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/venus/vkr_device.c b/src/venus/vkr_device.c index 41ccb95..4b069f2 100644 --- a/src/venus/vkr_device.c +++ b/src/venus/vkr_device.c @@ -139,6 +139,8 @@ vkr_device_init_entry_points(struct vkr_device *dev, uint32_t api_version) (PFN_vkGetImageDrmFormatModifierPropertiesEXT)vkGetDeviceProcAddr( handle, "vkGetImageDrmFormatModifierPropertiesEXT"); + dev->get_fence_fd = + (PFN_vkGetFenceFdKHR)vkGetDeviceProcAddr(handle, "vkGetFenceFdKHR"); dev->get_memory_fd = (PFN_vkGetMemoryFdKHR)vkGetDeviceProcAddr(handle, "vkGetMemoryFdKHR"); dev->get_memory_fd_properties = (PFN_vkGetMemoryFdPropertiesKHR)vkGetDeviceProcAddr( diff --git a/src/venus/vkr_device.h b/src/venus/vkr_device.h index db466b6..f9e749e 100644 --- a/src/venus/vkr_device.h +++ b/src/venus/vkr_device.h @@ -39,6 +39,7 @@ struct vkr_device { PFN_vkGetImageDrmFormatModifierPropertiesEXT get_image_drm_format_modifier_properties; + PFN_vkGetFenceFdKHR get_fence_fd; PFN_vkGetMemoryFdKHR get_memory_fd; PFN_vkGetMemoryFdPropertiesKHR get_memory_fd_properties; diff --git a/src/venus/vkr_instance.c b/src/venus/vkr_instance.c index c55299f..bd9f2fd 100644 --- a/src/venus/vkr_instance.c +++ b/src/venus/vkr_instance.c @@ -196,9 +196,6 @@ vkr_dispatch_vkCreateInstance(struct vn_dispatch_context *dispatch, return; } - instance->get_fence_fd = (PFN_vkGetFenceFdKHR)vkGetInstanceProcAddr( - instance->base.handle.instance, "vkGetFenceFdKHR"); - if (ctx->validate_level != VKR_CONTEXT_VALIDATE_NONE) { instance->create_debug_utils_messenger = (PFN_vkCreateDebugUtilsMessengerEXT)vkGetInstanceProcAddr( diff --git a/src/venus/vkr_instance.h b/src/venus/vkr_instance.h index 2552ae9..180b921 100644 --- a/src/venus/vkr_instance.h +++ b/src/venus/vkr_instance.h @@ -14,8 +14,6 @@ struct vkr_instance { uint32_t api_version; PFN_vkCreateDebugUtilsMessengerEXT create_debug_utils_messenger; PFN_vkDestroyDebugUtilsMessengerEXT destroy_debug_utils_messenger; - PFN_vkGetFenceFdKHR get_fence_fd; - VkDebugUtilsMessengerEXT validation_messenger; uint32_t physical_device_count;