projects / mesa.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 138970902875519d72e604114b18a2e6c286a09b..63574f4b1504f1d69764105e2a89f51fadc998af 100644 (file)
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -27,12 +27,20 @@ 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_ext_khr_swapchain.h     \
+       $(top_srcdir)/include/vulkan/vk_ext_khr_device_swapchain.h
 
 lib_LTLIBRARIES = libvulkan.la
 
 check_LTLIBRARIES = libvulkan-test.la
 
+PER_GEN_LIBS = \
+   libanv-gen7.la \
+   libanv-gen75.la \
+   libanv-gen8.la
+
+noinst_LTLIBRARIES = $(PER_GEN_LIBS)
+
 # The gallium includes are for the util/u_math.h include from main/macros.h
 
 AM_CPPFLAGS = \
@@ -41,6 +49,7 @@ AM_CPPFLAGS = \
        $(DEFINES) \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/glsl/nir \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
@@ -50,58 +59,103 @@ AM_CPPFLAGS = \
        -I$(top_builddir)/src/vulkan
 
 libvulkan_la_CFLAGS =                                                  \
-       -Wall -Wextra -Wno-unused-parameter -fvisibility=hidden -O0 -g  \
+       -Wall -Wno-unused-parameter -fvisibility=hidden -O0 -g          \
        -Wstrict-prototypes -Wmissing-prototypes -Wno-override-init
 
-libvulkan_la_CXXFLAGS =                                                        \
-       -Wall -Wextra -Wno-unused-parameter -fvisibility=hidden -O0 -g
-
 VULKAN_SOURCES =                                        \
        anv_allocator.c                                 \
        anv_cmd_buffer.c                                \
        anv_batch_chain.c                               \
-       anv_compiler.cpp                                \
+       anv_descriptor_set.c                            \
        anv_device.c                                    \
+        anv_dump.c                                      \
        anv_entrypoints.c                               \
        anv_entrypoints.h                               \
        anv_formats.c                                   \
        anv_image.c                                     \
        anv_intel.c                                     \
        anv_meta.c                                      \
+       anv_meta_clear.c                                \
+       anv_nir_apply_dynamic_offsets.c                 \
+       anv_nir_apply_pipeline_layout.c                 \
+       anv_nir_lower_push_constants.c                  \
+       anv_pass.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                                 \
-       gen7_state.c                                    \
+       isl.c                                           \
+       isl_format_layout.c
+
+BUILT_SOURCES =                                         \
+       anv_entrypoints.h                               \
+       anv_entrypoints.c                               \
+       isl_format_layout.c
+
+libanv_gen7_la_SOURCES =                                \
+       genX_cmd_buffer.c                               \
+       gen7_cmd_buffer.c                               \
+       gen7_pipeline.c                                 \
+       gen7_state.c
+libanv_gen7_la_CFLAGS = $(libvulkan_la_CFLAGS) -DANV_GENx10=70
+
+libanv_gen75_la_SOURCES =                               \
+       genX_cmd_buffer.c                               \
        gen7_cmd_buffer.c                               \
-       gen7_pipeline.c
+       gen7_pipeline.c                                 \
+       gen7_state.c
+libanv_gen75_la_CFLAGS = $(libvulkan_la_CFLAGS) -DANV_GENx10=75
+
+libanv_gen8_la_SOURCES =                               \
+       genX_cmd_buffer.c
+libanv_gen8_la_CFLAGS = $(libvulkan_la_CFLAGS) -DANV_GENx10=80
+
+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
 
-BUILT_SOURCES =                                         \
-       anv_entrypoints.h                               \
-       anv_entrypoints.c                               \
-       anv_meta_spirv_autogen.h
-
 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) $(PYTHON3) $(srcdir)/glsl_scraper.py --with-glslc=$(GLSLC) -o $@ $<
+isl_format_layout.c: isl_format_layout_gen.bash \
+                     isl_format_layout.csv
+       $(AM_V_GEN)$(srcdir)/isl_format_layout_gen.bash \
+           <$(srcdir)/isl_format_layout.csv >$@
 
 CLEANFILES = $(BUILT_SOURCES)
 
-libvulkan_la_LIBADD = -lxcb -lxcb-dri3 \
-       $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la
+libvulkan_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \
+       $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
+       ../mesa/libmesa.la \
+       ../mesa/drivers/dri/common/libdri_test_stubs.la \
+       -lpthread -ldl -lstdc++ \
+        $(PER_GEN_LIBS)
 
 # Libvulkan with dummy gem. Used for unit tests.
 
@@ -110,7 +164,6 @@ libvulkan_test_la_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