diff options
| author | Emil Velikov <[email protected]> | 2016-04-20 19:01:00 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-01 08:38:04 +0100 |
| commit | cbc4837b83157fd990ac5960badaba342be6cb33 (patch) | |
| tree | 47a49349b5981c3bff0596ed169210b5a59f0eed | |
| parent | 9bc99f56682721261fec90568255dc9b937faa7c (diff) | |
anv: kill of custom define HAVE_WAYLAND_PLATFORM
Vulkan API already has equivalent, so simplify things as just use it.
Signed-off-by: Emil Velikov <[email protected]>
Acked-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/intel/vulkan/Makefile.am | 3 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_device.c | 2 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_wsi.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am index fc221705657..98784aa2714 100644 --- a/src/intel/vulkan/Makefile.am +++ b/src/intel/vulkan/Makefile.am @@ -98,8 +98,7 @@ AM_CPPFLAGS += \ -I$(top_builddir)/src/egl/wayland/wayland-drm \ -I$(top_srcdir)/src/egl/wayland/wayland-drm \ $(WAYLAND_CFLAGS) \ - -DVK_USE_PLATFORM_WAYLAND_KHR \ - -DHAVE_WAYLAND_PLATFORM + -DVK_USE_PLATFORM_WAYLAND_KHR VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES) diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 4abcdf92af0..03a14392b4d 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -174,7 +174,7 @@ static const VkExtensionProperties global_extensions[] = { .extensionName = VK_KHR_XCB_SURFACE_EXTENSION_NAME, .specVersion = 5, }, -#ifdef HAVE_WAYLAND_PLATFORM +#ifdef VK_USE_PLATFORM_WAYLAND_KHR { .extensionName = VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, .specVersion = 4, diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c index c2938f3836f..850e14fd60d 100644 --- a/src/intel/vulkan/anv_wsi.c +++ b/src/intel/vulkan/anv_wsi.c @@ -32,7 +32,7 @@ anv_init_wsi(struct anv_instance *instance) if (result != VK_SUCCESS) return result; -#ifdef HAVE_WAYLAND_PLATFORM +#ifdef VK_USE_PLATFORM_WAYLAND_KHR result = anv_wl_init_wsi(instance); if (result != VK_SUCCESS) { anv_x11_finish_wsi(instance); @@ -46,7 +46,7 @@ anv_init_wsi(struct anv_instance *instance) void anv_finish_wsi(struct anv_instance *instance) { -#ifdef HAVE_WAYLAND_PLATFORM +#ifdef VK_USE_PLATFORM_WAYLAND_KHR anv_wl_finish_wsi(instance); #endif anv_x11_finish_wsi(instance); |