vk/wsi: Add Wayland WSI support

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

diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index 6d1212c532c14bae65bd9499f123b21499d08900..014183c0f716d67a514732e7a9c1e0e1578db72c 100644 (file)
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -19,6 +19,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+SUBDIRS = . tests
 
 vulkan_includedir = $(includedir)/vulkan
 
@@ -26,10 +27,13 @@ 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
 
+check_LTLIBRARIES = libvulkan-test.la
+
 # The gallium includes are for the util/u_math.h include from main/macros.h
 
 AM_CPPFLAGS = \
@@ -38,6 +42,7 @@ AM_CPPFLAGS = \
        $(DEFINES) \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/egl/wayland/wayland-drm \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
@@ -53,17 +58,15 @@ libvulkan_la_CFLAGS =                                                       \
 libvulkan_la_CXXFLAGS =                                                        \
        -Wall -Wextra -Wno-unused-parameter -fvisibility=hidden -O0 -g
 
-libvulkan_la_SOURCES =                                  \
+VULKAN_SOURCES =                                        \
        anv_allocator.c                                 \
-       anv_aub.c                                       \
        anv_cmd_buffer.c                                \
-       anv_cmd_emit.c                                  \
+       anv_batch_chain.c                               \
        anv_compiler.cpp                                \
        anv_device.c                                    \
        anv_entrypoints.c                               \
        anv_entrypoints.h                               \
        anv_formats.c                                   \
-       anv_gem.c                                       \
        anv_image.c                                     \
        anv_intel.c                                     \
        anv_meta.c                                      \
@@ -71,12 +74,24 @@ libvulkan_la_SOURCES =                                  \
        anv_private.h                                   \
        anv_query.c                                     \
        anv_util.c                                      \
-       anv_x11.c
+       anv_wsi.c                                       \
+       anv_wsi_wayland.c                               \
+       anv_wsi_x11.c                                   \
+       gen8_state.c                                    \
+       gen8_cmd_buffer.c                               \
+       gen8_pipeline.c                                 \
+       gen7_state.c                                    \
+       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.h
+       anv_meta_spirv_autogen.h
 
 anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
        $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< header > $@
@@ -84,12 +99,22 @@ anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
 anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
        $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< code > $@
 
-%_spirv.h: %.c glsl_scraper.py
-       $(AM_V_GEN) $(PYTHON2) $(srcdir)/glsl_scraper.py --glsl-only -o $@ $<
+%_spirv_autogen.h: %.c glsl_scraper.py
+       $(AM_V_GEN) $(PYTHON3) $(srcdir)/glsl_scraper.py --with-glslc=$(GLSLC) -o $@ $<
 
 CLEANFILES = $(BUILT_SOURCES)
 
 libvulkan_la_LIBADD = -lxcb -lxcb-dri3 \
        $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la
 
+# Libvulkan with dummy gem. Used for unit tests.
+
+libvulkan_test_la_SOURCES =                             \
+       $(VULKAN_SOURCES)                               \
+       anv_gem_stubs.c
+
+libvulkan_test_la_CFLAGS = $(libvulkan_la_CFLAGS)
+libvulkan_test_la_CXXFLAGS = $(libvulkan_la_CXXFLAGS)
+libvulkan_test_la_LIBADD = $(libvulkan_la_LIBADD)
+
 include $(top_srcdir)/install-lib-links.mk