From: Emil Velikov <emil.velikov@collabora.com>
Date: Wed, 20 Apr 2016 18:01:00 +0000 (+0100)
Subject: anv: kill of custom define HAVE_WAYLAND_PLATFORM
X-Git-Tag: upstream/17.1.0~10388
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cbc4837b83157fd990ac5960badaba342be6cb33;p=platform%2Fupstream%2Fmesa.git

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 <emil.velikov@collabora.com>
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
---

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index fc22170..98784aa 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 4abcdf9..03a1439 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 c2938f3..850e14f 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);