From: Emil Velikov <emil.veli...@collabora.com>
Vulkan API already has equivalent, so simplify things as just use it.
Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
---
src/intel/vulkan/Makefile.am | 3 +--
src/intel/vulkan/anv_device.c | 2 +-
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 f7f754f..587532b 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 00edd95..e07cca5 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);
--
2.8.0
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
