summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Ĺšlusarz <marcin.slusarz@gmail.com>2016-04-16 22:48:09 +0200
committerJason Ekstrand <jason.ekstrand@intel.com>2016-04-20 11:12:10 -0700
commit3caf2e89aa1711e80db80d2056e0a44663d9c7d2 (patch)
tree45037885ff9b35f08287617faddd4ca122c9a453
parent6c952d8ac7fd57d32170492adaca9c135edd8936 (diff)
downloadmesa-master.tar.gz
mesa-master.tar.xz
anv: fix build without Wayland platformHEADmaster
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
-rw-r--r--src/intel/vulkan/Makefile.am9
-rw-r--r--src/intel/vulkan/anv_private.h3
2 files changed, 5 insertions, 7 deletions
diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index a84be72..edbe213 100644
--- a/src/intel/vulkan/Makefile.am
+++ b/src/intel/vulkan/Makefile.am
@@ -31,8 +31,7 @@ vulkan_include_HEADERS = \
# Used when generating entrypoints to filter out unwanted extensions
VULKAN_ENTRYPOINT_CPPFLAGS = \
-I$(top_srcdir)/include/vulkan \
- -DVK_USE_PLATFORM_XCB_KHR \
- -DVK_USE_PLATFORM_WAYLAND_KHR
+ -DVK_USE_PLATFORM_XCB_KHR
lib_LTLIBRARIES = libvulkan_intel.la
@@ -67,7 +66,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/compiler/nir \
-I$(top_builddir)/src/intel
-libvulkan_intel_la_CFLAGS = $(CFLAGS) -Wno-override-init -msse2
+libvulkan_intel_la_CFLAGS = $(CFLAGS) -DVK_USE_PLATFORM_XCB_KHR -Wno-override-init -msse2
VULKAN_SOURCES = \
anv_allocator.c \
@@ -150,7 +149,9 @@ AM_CPPFLAGS += -I$(top_srcdir)/src/egl/wayland/wayland-drm
VULKAN_SOURCES += \
wayland-drm-protocol.c \
anv_wsi_wayland.c
-libvulkan_intel_la_CFLAGS += -DHAVE_WAYLAND_PLATFORM
+libvulkan_intel_la_CFLAGS += -DHAVE_WAYLAND_PLATFORM -DVK_USE_PLATFORM_WAYLAND_KHR
+
+VULKAN_ENTRYPOINT_CPPFLAGS += -DVK_USE_PLATFORM_WAYLAND_KHR
endif
libvulkan_intel_la_SOURCES = \
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index ae2e08d..2840f98 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -52,9 +52,6 @@ typedef struct xcb_connection_t xcb_connection_t;
typedef uint32_t xcb_visualid_t;
typedef uint32_t xcb_window_t;
-#define VK_USE_PLATFORM_XCB_KHR
-#define VK_USE_PLATFORM_WAYLAND_KHR
-
#define VK_PROTOTYPES
#include <vulkan/vulkan.h>
#include <vulkan/vulkan_intel.h>