Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 1 | From 1523ab462c1bf19055960ced255f4872b6cf9f5c Mon Sep 17 00:00:00 2001 |
| 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 3 | Date: Wed, 5 Jul 2017 11:00:42 +0300 |
| 4 | Subject: [PATCH 1/2] vkdisplay: Use ifdef for platform specific defines |
| 5 | |
| 6 | VK_KHR_*_SURFACE_EXTENSION_NAME are only available when corresponding |
| 7 | WSI is enabled. |
| 8 | |
| 9 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
| 10 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=784539] |
| 11 | --- |
| 12 | ext/vulkan/vkdisplay.c | 4 ++++ |
| 13 | 1 file changed, 4 insertions(+) |
| 14 | |
| 15 | diff --git a/ext/vulkan/vkdisplay.c b/ext/vulkan/vkdisplay.c |
| 16 | index 550134cd8..ade5d4583 100644 |
| 17 | --- a/ext/vulkan/vkdisplay.c |
| 18 | +++ b/ext/vulkan/vkdisplay.c |
| 19 | @@ -448,11 +448,15 @@ gst_vulkan_display_type_to_extension_string (GstVulkanDisplayType type) |
| 20 | if (type == GST_VULKAN_DISPLAY_TYPE_NONE) |
| 21 | return NULL; |
| 22 | |
| 23 | +#if GST_VULKAN_HAVE_WINDOW_XCB |
| 24 | if (type & GST_VULKAN_DISPLAY_TYPE_XCB) |
| 25 | return VK_KHR_XCB_SURFACE_EXTENSION_NAME; |
| 26 | +#endif |
| 27 | |
| 28 | +#if GST_VULKAN_HAVE_WINDOW_WAYLAND |
| 29 | if (type & GST_VULKAN_DISPLAY_TYPE_WAYLAND) |
| 30 | return VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME; |
| 31 | +#endif |
| 32 | |
| 33 | return NULL; |
| 34 | } |
| 35 | -- |
| 36 | 2.13.2 |
| 37 | |