From 5e0a7b0befcc91ce66e5476a15fa1d0a8bf956dd Mon Sep 17 00:00:00 2001 From: shegangbin Date: Tue, 10 Oct 2023 09:44:42 +0000 Subject: [PATCH] revert old interfaces Signed-off-by: shegangbin Change-Id: I10a915db8f818677af62c8294077713276102cd7 --- include/vulkan/vulkan_ohos.h | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/include/vulkan/vulkan_ohos.h b/include/vulkan/vulkan_ohos.h index e0bf8c6..b0efb54 100644 --- a/include/vulkan/vulkan_ohos.h +++ b/include/vulkan/vulkan_ohos.h @@ -70,43 +70,11 @@ typedef struct VkPhysicalDevicePresentationPropertiesOHOS { VkBool32 sharedImage; } VkPhysicalDevicePresentationPropertiesOHOS; -/** - * @brief this type is deprecated, please use PFN_vkAcquireImageOHOS instead - * @deprecated - */ -typedef VkResult (VKAPI_PTR *PFN_vkSetNativeFenceFdOpenHarmony)(VkDevice device, int32_t nativeFenceFd, VkSemaphore semaphore, VkFence fence); - -/** - * @brief this type is deprecated, please use PFN_vkQueueSignalReleaseImageOHOS instead - * @deprecated - */ -typedef VkResult (VKAPI_PTR *PFN_vkGetNativeFenceFdOpenHarmony)(VkQueue queue, uint32_t waitSemaphoreCount, const VkSemaphore* pWaitSemaphores, VkImage image, int32_t* pNativeFenceFd); typedef VkResult (VKAPI_PTR *PFN_vkGetSwapchainGrallocUsageOHOS)(VkDevice device, VkFormat format, VkImageUsageFlags imageUsage, uint64_t* grallocUsage); typedef VkResult (VKAPI_PTR *PFN_vkAcquireImageOHOS)(VkDevice device, VkImage image, int32_t nativeFenceFd, VkSemaphore semaphore, VkFence fence); typedef VkResult (VKAPI_PTR *PFN_vkQueueSignalReleaseImageOHOS)(VkQueue queue, uint32_t waitSemaphoreCount, const VkSemaphore* pWaitSemaphores, VkImage image, int32_t* pNativeFenceFd); #ifndef VK_NO_PROTOTYPES -/** - * @brief this interface is deprecated, please use vkAcquireImageOHOS instead - * @deprecated - */ -VKAPI_ATTR VkResult VKAPI_CALL vkSetNativeFenceFdOpenHarmony( - VkDevice device, - int32_t nativeFenceFd, - VkSemaphore semaphore, - VkFence fence); - -/** - * @brief this interface is deprecated, please use vkQueueSignalReleaseImageOHOS instead - * @deprecated - */ -VKAPI_ATTR VkResult VKAPI_CALL vkGetNativeFenceFdOpenHarmony( - VkQueue queue, - uint32_t waitSemaphoreCount, - const VkSemaphore* pWaitSemaphores, - VkImage image, - int32_t* pNativeFenceFd); - VKAPI_ATTR VkResult VKAPI_CALL vkGetSwapchainGrallocUsageOHOS( VkDevice device, VkFormat format,