drisw: use getImageShm() if available

[mesa.git] / src / compiler / Makefile.nir.am

diff --git a/src/compiler/Makefile.nir.am b/src/compiler/Makefile.nir.am
index 6cef3229e46660f6cbea68799a49923811d03eb0..4ccd7f36be9e20effb39051b9f7abb33c70da4a1 100644 (file)
--- a/src/compiler/Makefile.nir.am
+++ b/src/compiler/Makefile.nir.am
@@ -29,11 +29,10 @@ nir_libnir_la_LIBADD = \
 nir_libnir_la_SOURCES =                                        \
        $(NIR_FILES)                                    \
        $(SPIRV_FILES)                                  \
+       $(SPIRV_GENERATED_FILES)                        \
        $(NIR_GENERATED_FILES)
 
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
-
-nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py
+nir/nir_builder_opcodes.h: nir/nir_opcodes.py nir/nir_builder_opcodes_h.py nir/nir_intrinsics.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) $(srcdir)/nir/nir_builder_opcodes_h.py > $@ || ($(RM) $@; false)
 
@@ -41,6 +40,14 @@ nir/nir_constant_expressions.c: nir/nir_opcodes.py nir/nir_constant_expressions.
        $(MKDIR_GEN)
        $(PYTHON_GEN) $(srcdir)/nir/nir_constant_expressions.py > $@ || ($(RM) $@; false)
 
+nir/nir_intrinsics.h: nir/nir_intrinsics.py nir/nir_intrinsics_h.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/nir/nir_intrinsics_h.py --outdir nir || ($(RM) $@; false)
+
+nir/nir_intrinsics.c: nir/nir_intrinsics.py nir/nir_intrinsics_c.py
+       $(MKDIR_GEN)
+       $(PYTHON_GEN) $(srcdir)/nir/nir_intrinsics_c.py --outdir nir || ($(RM) $@; false)
+
 nir/nir_opcodes.h: nir/nir_opcodes.py nir/nir_opcodes_h.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) $(srcdir)/nir/nir_opcodes_h.py > $@ || ($(RM) $@; false)
@@ -53,25 +60,6 @@ nir/nir_opt_algebraic.c: nir/nir_opt_algebraic.py nir/nir_algebraic.py
        $(MKDIR_GEN)
        $(PYTHON_GEN) $(srcdir)/nir/nir_opt_algebraic.py > $@ || ($(RM) $@; false)
 
-noinst_PROGRAMS += spirv2nir
-
-spirv2nir_SOURCES = \
-       spirv/spirv2nir.c
-
-spirv2nir_CPPFLAGS =                                   \
-       $(AM_CPPFLAGS)                                  \
-       -I$(top_builddir)/src/compiler/nir              \
-       -I$(top_srcdir)/src/compiler/nir                \
-       -I$(top_srcdir)/src/compiler/spirv
-
-spirv2nir_LDADD =                                      \
-       nir/libnir.la                                   \
-       $(top_builddir)/src/util/libmesautil.la         \
-       -lm                                             \
-       $(PTHREAD_LIBS)
-
-nodist_EXTRA_spirv2nir_SOURCES = dummy.cpp
-
 check_PROGRAMS += nir/tests/control_flow_tests
 
 nir_tests_control_flow_tests_CPPFLAGS = \
@@ -93,16 +81,24 @@ nir_tests_control_flow_tests_LDADD =                        \
 TESTS += nir/tests/control_flow_tests
 
 
-BUILT_SOURCES += $(NIR_GENERATED_FILES)
-CLEANFILES += $(NIR_GENERATED_FILES)
+BUILT_SOURCES += \
+       $(NIR_GENERATED_FILES)
+
+CLEANFILES += \
+       $(NIR_GENERATED_FILES)
 
 EXTRA_DIST += \
        nir/nir_algebraic.py                            \
        nir/nir_builder_opcodes_h.py                    \
        nir/nir_constant_expressions.py                 \
+       nir/nir_intrinsics.py                           \
+       nir/nir_intrinsics_c.py                         \
+       nir/nir_intrinsics_h.py                         \
        nir/nir_opcodes.py                              \
        nir/nir_opcodes_c.py                            \
        nir/nir_opcodes_h.py                            \
        nir/nir_opt_algebraic.py                        \
        nir/tests \
-       SConscript.nir
+       nir/README \
+       SConscript.nir \
+       SConscript.spirv