OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: kill of custom define HAVE_WAYLAND_PLATFORM

Browse Source 
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:
Emil Velikov
2016-04-20 19:01:00 +01:00
committed by Emil Velikov
parent 9bc99f5668
commit cbc4837b83
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/intel/vulkan/Makefile.am
View File

@@ -98,8 +98,7 @@ AM_CPPFLAGS += \
-I$(top_builddir)/src/egl/wayland/wayland-drm \ -I$(top_builddir)/src/egl/wayland/wayland-drm \
-I$(top_srcdir)/src/egl/wayland/wayland-drm \ -I$(top_srcdir)/src/egl/wayland/wayland-drm \
$(WAYLAND_CFLAGS) \ $(WAYLAND_CFLAGS) \
-DVK_USE_PLATFORM_WAYLAND_KHR \ -DVK_USE_PLATFORM_WAYLAND_KHR
-DHAVE_WAYLAND_PLATFORM
VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES) VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)

2
src/intel/vulkan/anv_device.c
View File

@@ -174,7 +174,7 @@ static const VkExtensionProperties global_extensions[] = {
.extensionName = VK_KHR_XCB_SURFACE_EXTENSION_NAME, .extensionName = VK_KHR_XCB_SURFACE_EXTENSION_NAME,
.specVersion = 5, .specVersion = 5,
}, },
#ifdef HAVE_WAYLAND_PLATFORM #ifdef VK_USE_PLATFORM_WAYLAND_KHR
{ {
.extensionName = VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, .extensionName = VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME,
.specVersion = 4, .specVersion = 4,

4
src/intel/vulkan/anv_wsi.c
View File

@@ -32,7 +32,7 @@ anv_init_wsi(struct anv_instance *instance)
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;
#ifdef HAVE_WAYLAND_PLATFORM #ifdef VK_USE_PLATFORM_WAYLAND_KHR
result = anv_wl_init_wsi(instance); result = anv_wl_init_wsi(instance);
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
anv_x11_finish_wsi(instance); anv_x11_finish_wsi(instance);
@@ -46,7 +46,7 @@ anv_init_wsi(struct anv_instance *instance)
void void
anv_finish_wsi(struct anv_instance *instance) anv_finish_wsi(struct anv_instance *instance)
{ {
#ifdef HAVE_WAYLAND_PLATFORM #ifdef VK_USE_PLATFORM_WAYLAND_KHR
anv_wl_finish_wsi(instance); anv_wl_finish_wsi(instance);
#endif #endif
anv_x11_finish_wsi(instance); anv_x11_finish_wsi(instance);