WIP: Partially upgrade to vulkan v0.221.0

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

diff --git a/src/vulkan/Makefile.am b/src/vulkan/Makefile.am
index 8538046e5679e855234e1fc0e974d840feb9dbce..efb781e8c0b5164a8a711bba298cd59f19c327a0 100644 (file)
--- a/src/vulkan/Makefile.am
+++ b/src/vulkan/Makefile.am
@@ -26,14 +26,26 @@ vulkan_includedir = $(includedir)/vulkan
 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_ext_khr_swapchain.h     \
-       $(top_srcdir)/include/vulkan/vk_ext_khr_device_swapchain.h
+       $(top_srcdir)/include/vulkan/vulkan_intel.h
+
+# 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
 
 lib_LTLIBRARIES = libvulkan.la
 
 check_LTLIBRARIES = libvulkan-test.la
 
+PER_GEN_LIBS = \
+   libanv-gen7.la \
+   libanv-gen75.la \
+   libanv-gen8.la \
+   libanv-gen9.la
+
+noinst_LTLIBRARIES = $(PER_GEN_LIBS)
+
 # The gallium includes are for the util/u_math.h include from main/macros.h
 
 AM_CPPFLAGS = \
@@ -49,16 +61,18 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa/drivers/dri/i965 \
        -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/isl/ \
+       -I$(top_builddir)/src \
+       -I$(top_builddir)/src/glsl/nir \
        -I$(top_builddir)/src/vulkan
 
-libvulkan_la_CFLAGS =                                                  \
-       -Wall -Wno-unused-parameter -fvisibility=hidden -O0 -g          \
-       -Wstrict-prototypes -Wmissing-prototypes -Wno-override-init
+libvulkan_la_CFLAGS = $(CFLAGS) -Wno-override-init
 
 VULKAN_SOURCES =                                        \
        anv_allocator.c                                 \
        anv_cmd_buffer.c                                \
        anv_batch_chain.c                               \
+       anv_descriptor_set.c                            \
        anv_device.c                                    \
         anv_dump.c                                      \
        anv_entrypoints.c                               \
@@ -67,25 +81,50 @@ VULKAN_SOURCES =                                        \
        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_wsi.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
+       anv_wsi_x11.c
 
 BUILT_SOURCES =                                         \
        anv_entrypoints.h                               \
        anv_entrypoints.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_state.c
+libanv_gen75_la_CFLAGS = $(libvulkan_la_CFLAGS) -DANV_GENx10=75
+
+libanv_gen8_la_SOURCES =                                       \
+       genX_cmd_buffer.c                               \
+       gen8_cmd_buffer.c                               \
+       gen8_pipeline.c                                 \
+       gen8_state.c
+libanv_gen8_la_CFLAGS = $(libvulkan_la_CFLAGS) -DANV_GENx10=80
+
+libanv_gen9_la_SOURCES =                                       \
+       genX_cmd_buffer.c                               \
+       gen8_cmd_buffer.c                               \
+       gen8_pipeline.c                                 \
+       gen8_state.c
+libanv_gen9_la_CFLAGS = $(libvulkan_la_CFLAGS) -DANV_GENx10=90
+
 if HAVE_EGL_PLATFORM_WAYLAND
 BUILT_SOURCES += \
        wayland-drm-protocol.c \
@@ -109,18 +148,20 @@ libvulkan_la_SOURCES =                                  \
        anv_gem.c
 
 anv_entrypoints.h : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
-       $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< header > $@
+       $(AM_V_GEN) cat $(vulkan_include_HEADERS) | $(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) - | $(PYTHON2) $< header > $@
 
 anv_entrypoints.c : anv_entrypoints_gen.py $(vulkan_include_HEADERS)
-       $(AM_V_GEN)cat $(vulkan_include_HEADERS) | $(PYTHON2) $< code > $@
+       $(AM_V_GEN) cat $(vulkan_include_HEADERS) | $(CPP) $(VULKAN_ENTRYPOINT_CPPFLAGS) - | $(PYTHON2) $< code > $@
 
 CLEANFILES = $(BUILT_SOURCES)
 
 libvulkan_la_LIBADD = $(WAYLAND_LIBS) -lxcb -lxcb-dri3 \
+       $(top_builddir)/src/isl/libisl.la \
        $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
        ../mesa/libmesa.la \
        ../mesa/drivers/dri/common/libdri_test_stubs.la \
-       -lpthread -ldl -lstdc++
+       -lpthread -ldl -lstdc++ \
+        $(PER_GEN_LIBS)
 
 # Libvulkan with dummy gem. Used for unit tests.