summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2021-04-06 10:40:01 +0200
committerRene Ladan <rene@FreeBSD.org>2021-04-06 10:46:52 +0200
commit1227b53ed1c53ea13efeac2bfe3fae5532c529ec (patch)
tree551daaabc2287f94c3b2d7b59c0cc2a235156540 /www/chromium/files/patch-gpu_vulkan_vulkan__function__pointers.h
parentDocument new vulnerabilities in www/chromium < 89.0.4389.114 (diff)
www/chromium: update to 89.0.4389.114
Submitted by: Matthias Wolf via github Security: https://www.vuxml.org/freebsd/bddadaa4-9227-11eb-99c5-e09467587c17.html
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.h41
1 files changed, 33 insertions, 8 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 80384a93a072..5bdfdbaadc1b 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 2021-01-18 21:28:59 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig 2021-03-12 23:57:25 UTC
+++ gpu/vulkan/vulkan_function_pointers.h
-@@ -235,10 +235,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -240,10 +240,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
vkGetAndroidHardwareBufferPropertiesANDROID;
#endif // defined(OS_ANDROID)
@@ -13,7 +13,7 @@
#if defined(OS_WIN)
VulkanFunction<PFN_vkGetSemaphoreWin32HandleKHR> vkGetSemaphoreWin32HandleKHR;
-@@ -246,10 +246,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -251,10 +251,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
vkImportSemaphoreWin32HandleKHR;
#endif // defined(OS_WIN)
@@ -26,7 +26,20 @@
#if defined(OS_WIN)
VulkanFunction<PFN_vkGetMemoryWin32HandleKHR> vkGetMemoryWin32HandleKHR;
-@@ -954,7 +954,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope
+@@ -291,10 +291,10 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+ VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
+ VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
+
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
+ vkGetImageDrmFormatModifierPropertiesEXT;
+-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ };
+
+ } // namespace gpu
+@@ -985,7 +985,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope
}
#endif // defined(OS_ANDROID)
@@ -35,7 +48,7 @@
ALWAYS_INLINE VkResult
vkGetSemaphoreFdKHR(VkDevice device,
const VkSemaphoreGetFdInfoKHR* pGetFdInfo,
-@@ -968,7 +968,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR(
+@@ -999,7 +999,7 @@ ALWAYS_INLINE VkResult vkImportSemaphoreFdKHR(
return gpu::GetVulkanFunctionPointers()->vkImportSemaphoreFdKHR(
device, pImportSemaphoreFdInfo);
}
@@ -44,7 +57,7 @@
#if defined(OS_WIN)
ALWAYS_INLINE VkResult vkGetSemaphoreWin32HandleKHR(
-@@ -987,7 +987,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device,
+@@ -1018,7 +1018,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device,
}
#endif // defined(OS_WIN)
@@ -53,7 +66,7 @@
ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device,
const VkMemoryGetFdInfoKHR* pGetFdInfo,
int* pFd) {
-@@ -1002,7 +1002,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device,
+@@ -1033,7 +1033,7 @@ vkGetMemoryFdPropertiesKHR(VkDevice device,
return gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHR(
device, handleType, fd, pMemoryFdProperties);
}
@@ -62,10 +75,22 @@
#if defined(OS_WIN)
ALWAYS_INLINE VkResult vkGetMemoryWin32HandleKHR(
-@@ -1082,4 +1082,4 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1113,7 +1113,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
pPresentInfo);
}
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
+ VkDevice device,
+ VkImage image,
+@@ -1121,6 +1121,6 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+ return gpu::GetVulkanFunctionPointers()
+ ->vkGetImageDrmFormatModifierPropertiesEXT(device, image, pProperties);
+ }
+-#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)
++#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+
-#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_
\ No newline at end of file
+#endif // GPU_VULKAN_VULKAN_FUNCTION_POINTERS_H_