projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6c952d8)
anv: fix build without Wayland platform
authorMarcin Ślusarz <marcin.slusarz@gmail.com>
Sat, 16 Apr 2016 20:48:09 +0000 (22:48 +0200)
committerJason Ekstrand <jason.ekstrand@intel.com>
Wed, 20 Apr 2016 18:12:10 +0000 (11:12 -0700)
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
src/intel/vulkan/Makefile.am patch | blob | history
src/intel/vulkan/anv_private.h patch | blob | history

diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
index a84be7295489e914293e02c9e33e587da5dfd888..edbe2132b2280d0c79d5957b4b72835671e95664 100644 (file)
--- 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 ae2e08d2dfb405a36b19dfe42672ced9414281e7..2840f98419347abed3db0ff0cf1c82678ed035f3 100644 (file)
--- 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>