Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / vulkan / Makefile.am

diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index 89880b77c018a97591664ad5d23253bed40f5644..765d2cef03ddd35f3b85a59adf89d0e793089772 100644 (file)
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -27,7 +27,8 @@ vulkan_include_HEADERS =                              \
        $(top_srcdir)/include/vulkan/vk_platform.h      \
        $(top_srcdir)/include/vulkan/vulkan.h           \
        $(top_srcdir)/include/vulkan/vulkan_intel.h     \
-       $(top_srcdir)/include/vulkan/vk_wsi_lunarg.h
+       $(top_srcdir)/include/vulkan/vk_wsi_swapchain.h \
+       $(top_srcdir)/include/vulkan/vk_wsi_device_swapchain.h
 
 lib_LTLIBRARIES = libvulkan.la
 
@@ -68,11 +69,13 @@ VULKAN_SOURCES =                                        \
        anv_image.c                                     \
        anv_intel.c                                     \
        anv_meta.c                                      \
+       anv_nir_apply_dynamic_offsets.c                 \
        anv_pipeline.c                                  \
        anv_private.h                                   \
        anv_query.c                                     \
        anv_util.c                                      \
-       anv_x11.c                                       \
+       anv_wsi.c                                       \
+       anv_wsi_x11.c                                   \
        gen8_state.c                                    \
        gen8_cmd_buffer.c                               \
        gen8_pipeline.c                                 \
@@ -80,27 +83,42 @@ VULKAN_SOURCES =                                        \
        gen7_cmd_buffer.c                               \
        gen7_pipeline.c
 
-libvulkan_la_SOURCES =                                  \
-       $(VULKAN_SOURCES)                               \
-       anv_gem.c
-
 BUILT_SOURCES =                                         \
        anv_entrypoints.h                               \
        anv_entrypoints.c                               \
        anv_meta_spirv_autogen.h
 
+if HAVE_EGL_PLATFORM_WAYLAND
+BUILT_SOURCES += \
+       wayland-drm-protocol.c \
+       wayland-drm-client-protocol.h
+
+%-protocol.c : $(top_srcdir)/src/egl/wayland/wayland-drm/%.xml
+       $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+
+%-client-protocol.h : $(top_srcdir)/src/egl/wayland/wayland-drm/%.xml
+       $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+
+AM_CPPFLAGS += -I$(top_srcdir)/src/egl/wayland/wayland-drm
+VULKAN_SOURCES += \
+       wayland-drm-protocol.c \
+       anv_wsi_wayland.c
+libvulkan_la_CFLAGS += -DHAVE_WAYLAND_PLATFORM
+endif
+
+libvulkan_la_SOURCES =                                  \
+       $(VULKAN_SOURCES)                               \
+       anv_gem.c
+
 anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
        $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< header > $@
 
 anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
        $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< code > $@
 
-%_spirv_autogen.h: %.c glsl_scraper.py
-       $(AM_V_GEN) $(PYTHON2) $(srcdir)/glsl_scraper.py --glsl-only -o $@ $<
-
 CLEANFILES = $(BUILT_SOURCES)
 
-libvulkan_la_LIBADD = -lxcb -lxcb-dri3 \
+libvulkan_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \
        $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la
 
 # Libvulkan with dummy gem. Used for unit tests.