diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2020-07-30 20:39:39 +0000 |
| commit | 2dd4dd29c063a32031fb5549616ba28e76310f0a (patch) | |
| tree | 0427b26fe2d2bae71ff47102b5e646fdf927c022 /www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h | |
| parent | devel/cdecl: update to 8.0. (diff) | |
www/chromium: update to 84.0.4147.105
Submitted by: Matthias Wolf via GitHub
MFH: 2020Q3
Security: http://vuxml.freebsd.org/freebsd/9a447f78-d0f8-11ea-9837-e09467587c17.html
Security: http://vuxml.freebsd.org/freebsd/870d59b0-c6c4-11ea-8015-e09467587c17.html
Notes
Notes:
svn path=/head/; revision=543833
Diffstat (limited to 'www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h')
| -rw-r--r-- | www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h | 55 |
1 files changed, 37 insertions, 18 deletions
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 4210be5d6669..22094637bcf5 100644 --- a/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2020-05-13 18:40:32 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2020-07-07 21:58:16 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -227,15 +227,15 @@ struct VulkanFunctionPointers { +@@ -235,10 +235,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers vkGetAndroidHardwareBufferPropertiesANDROIDFn; #endif // defined(OS_ANDROID) @@ -11,6 +11,12 @@ -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #if defined(OS_WIN) + VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> +@@ -247,10 +247,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers + vkImportSemaphoreWin32HandleKHRFn; + #endif // defined(OS_WIN) + -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHRFn; @@ -18,34 +24,47 @@ -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #if defined(OS_FUCHSIA) - VulkanFunction<PFN_vkImportSemaphoreZirconHandleFUCHSIA> -@@ -447,18 +447,18 @@ struct VulkanFunctionPointers { - ->vkGetAndroidHardwareBufferPropertiesANDROIDFn + #if defined(OS_WIN) + VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHRFn; +@@ -950,7 +950,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope + } #endif // defined(OS_ANDROID) -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #define vkGetSemaphoreFdKHR \ - gpu::GetVulkanFunctionPointers()->vkGetSemaphoreFdKHRFn - #define vkImportSemaphoreFdKHR \ - gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn + ALWAYS_INLINE VkResult + vkGetSemaphoreFdKHR(VkDevice device, + const VkSemaphoreGetFdInfoKHR* pGetFdInfo, +@@ -964,7 +964,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR( + return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHRFn( + device, pImportSemaphoreFdInfo); + } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #if defined(OS_WIN) + ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR( +@@ -983,7 +983,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, + } + #endif // defined(OS_WIN) + -#if defined(OS_LINUX) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn - #define vkGetMemoryFdPropertiesKHR \ - gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn + ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, + const VkMemoryGetFdInfoKHR* pGetFdInfo, + int* pFd) { +@@ -998,7 +998,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device, + return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn( + device, handleType, fd, pMemoryFdProperties); + } -#endif // defined(OS_LINUX) || defined(OS_ANDROID) +#endif // defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) - #if defined(OS_FUCHSIA) - #define vkImportSemaphoreZirconHandleFUCHSIA \ -@@ -493,4 +493,4 @@ struct VulkanFunctionPointers { - gpu::GetVulkanFunctionPointers()->vkGetSwapchainImagesKHRFn - #define vkQueuePresentKHR gpu::GetVulkanFunctionPointers()->vkQueuePresentKHRFn + #if defined(OS_WIN) + ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR( +@@ -1079,4 +1079,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue + pPresentInfo); + } -#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_ \ No newline at end of file |