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>
This commit is contained in:
parent
9bc99f5668
commit
cbc4837b83
|
@ -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)
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue