[Mesa-dev] [PATCH] anv: fix build without Wayland platform

[Jason Ekstrand]

Pushed.  Thanks!

On Sat, Apr 16, 2016 at 1:48 PM, Marcin Ślusarz <marcin.slusarz at gmail.com>
wrote:

>
> ---
>  src/intel/vulkan/Makefile.am   | 9 +++++----
>  src/intel/vulkan/anv_private.h | 3 ---
>  2 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/src/intel/vulkan/Makefile.am b/src/intel/vulkan/Makefile.am
> index cba6671..a201bed 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
> +libvulkan_intel_la_CFLAGS = $(CFLAGS) -DVK_USE_PLATFORM_XCB_KHR
> -Wno-override-init
>
>  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>
> --
> 2.5.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20160420/80e2c50c/attachment.html>